Merge pull request #290 from performant-software/feature/cdc240_place…

…_edit_form CDC #240 - Place Edit Form
performant-software · Jul 17, 2024 · 0100a8b · 0100a8b
2 parents 9ae7be9 + c950605
commit 0100a8b
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 16 deletions.
diff --git a/packages/controlled-vocabulary/package.json b/packages/controlled-vocabulary/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/controlled-vocabulary",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -23,8 +23,8 @@
     "underscore": "^1.13.2"
   },
   "peerDependencies": {
-    "@performant-software/semantic-components": "^2.2.6",
-    "@performant-software/shared-components": "^2.2.6",
+    "@performant-software/semantic-components": "^2.2.7",
+    "@performant-software/shared-components": "^2.2.7",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dom": ">= 16.13.1 < 19.0.0"
   },

diff --git a/packages/core-data/package.json b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/core-data",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of components used with the Core Data platform.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -37,8 +37,8 @@
     "underscore": "^1.13.2"
   },
   "peerDependencies": {
-    "@performant-software/shared-components": "^2.2.6",
-    "@performant-software/geospatial": "^2.2.6",
+    "@performant-software/shared-components": "^2.2.7",
+    "@performant-software/geospatial": "^2.2.7",
     "@peripleo/maplibre": "^0.5.2",
     "@peripleo/peripleo": "^0.5.2",
     "react": ">= 16.13.1 < 19.0.0",

diff --git a/packages/geospatial/package.json b/packages/geospatial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/geospatial",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of components for all things map-related.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",

diff --git a/packages/geospatial/src/components/MapDraw.js b/packages/geospatial/src/components/MapDraw.js
@@ -11,7 +11,8 @@ import React, {
   useState,
   type Node
 } from 'react';
-import Map, { type MapboxMap } from 'react-map-gl';
+import Map, { type MapboxMap, NavigationControl } from 'react-map-gl';
+import { FullscreenControl } from 'react-map-gl/maplibre';
 import _ from 'underscore';
 import DrawControl from './DrawControl';
 import GeocodingControl from './GeocodingControl';
@@ -39,11 +40,21 @@ type Props = {
    */
   children?: Node,
 
+  /**
+   * If `true`, the map will require CTRL + scroll to zoom.
+   */
+  cooperativeGestures?: boolean,
+
   /**
    * GeoJSON structured data to be displayed on the map.
    */
   data: GeometryCollection | FeatureCollection,
 
+  /**
+   * If `true`, a control will be rendered to put the map in full screen mode.
+   */
+  fullscreen?: boolean,
+
   /**
    * Controls the type of GeoJSON data returned from the MapTiler Geocoding API.
    */
@@ -54,6 +65,11 @@ type Props = {
    */
   mapStyle: string,
 
+  /**
+   * If `true`, the navigation controls will display.
+   */
+  navigation?: boolean,
+
   /**
    * Callback fired when the map geometries are changed.
    *
@@ -180,6 +196,7 @@ const MapDraw = (props: Props) => {
   return (
     <Map
       attributionControl={false}
+      cooperativeGestures={props.cooperativeGestures}
       onLoad={() => setLoaded(true)}
       mapLib={maplibregl}
       ref={mapRef}
@@ -210,13 +227,20 @@ const MapDraw = (props: Props) => {
           showResultMarkers={false}
         />
       )}
+      { props.navigation && (
+        <NavigationControl />
+      )}
+      { props.fullscreen && (
+        <FullscreenControl />
+      )}
       { props.children }
     </Map>
   );
 };
 
 MapDraw.defaultProps = {
   buffer: DEFAULT_BUFFER,
+  cooperativeGestures: true,
   zoomDuration: DEFAULT_ZOOM_DELAY
 };
 

diff --git a/packages/semantic-ui/package.json b/packages/semantic-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/semantic-components",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of shared components based on the Semantic UI Framework.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -35,7 +35,7 @@
     "zotero-translation-client": "^5.0.1"
   },
   "peerDependencies": {
-    "@performant-software/shared-components": "^2.2.6",
+    "@performant-software/shared-components": "^2.2.7",
     "@samvera/clover-iiif": "^2.3.2",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dnd": "^11.1.3",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/shared-components",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of shared, framework agnostic, components.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",

diff --git a/packages/storybook/src/geospatial/MapDraw.stories.js b/packages/storybook/src/geospatial/MapDraw.stories.js
@@ -237,3 +237,30 @@ export const GeocodingPolygons = () => (
     onGeocodingSelection={action('onGeocodingSelection')}
   />
 );
+
+export const DisableCooperativeGestures = () => (
+  <MapDraw
+    apiKey={mapTilerKey}
+    cooperativeGestures={false}
+    mapStyle='https://api.maptiler.com/maps/basic-v2/style.json'
+    onChange={action('onChange')}
+  />
+);
+
+export const FullScreenControl = () => (
+  <MapDraw
+    apiKey={mapTilerKey}
+    fullscreen
+    mapStyle='https://api.maptiler.com/maps/basic-v2/style.json'
+    onChange={action('onChange')}
+  />
+);
+
+export const NavigationControl = () => (
+  <MapDraw
+    apiKey={mapTilerKey}
+    mapStyle='https://api.maptiler.com/maps/basic-v2/style.json'
+    navigation
+    onChange={action('onChange')}
+  />
+);
diff --git a/packages/user-defined-fields/package.json b/packages/user-defined-fields/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/user-defined-fields",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -23,8 +23,8 @@
     "underscore": "^1.13.2"
   },
   "peerDependencies": {
-    "@performant-software/semantic-components": "^2.2.6",
-    "@performant-software/shared-components": "^2.2.6",
+    "@performant-software/semantic-components": "^2.2.7",
+    "@performant-software/shared-components": "^2.2.7",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dom": ">= 16.13.1 < 19.0.0"
   },

diff --git a/packages/visualize/package.json b/packages/visualize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/visualize",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A package of components used for data visualization",
   "license": "MIT",
   "main": "./dist/index.cjs.js",

diff --git a/react-components.json b/react-components.json
@@ -8,5 +8,5 @@
     "packages/user-defined-fields",
     "packages/visualize"
   ],
-  "version": "2.2.6"
+  "version": "2.2.7"
 }