@opengeoweb/warnings 9.20.2 → 9.21.0

package/index.esm.js

@@ -7877,7 +7877,7 @@ const levelOptions = t => [Object.assign({
 }, LevelColors[WarningLevel.severe]), Object.assign({
   title: t('warning-level-extreme'),
   key: WarningLevel.extreme
-}, LevelColors['extreme'])];
+}, LevelColors[WarningLevel.extreme])];
 const LevelField = ({
   isDisabled: _isDisabled = false,
   isReadOnly: _isReadOnly = false
@@ -8286,6 +8286,16 @@ const getErrors = errors => errors ? errors === null || errors === void 0 ? void
   title: '',
   errors: []
 }) : null;
+const getWarningGeoJSONWithColor = (level, geoJSON) => produce(geoJSON, draft => {
+  const draftFeature = draft === null || draft === void 0 ? void 0 : draft.features[0];
+  if (draftFeature) {
+    const defaultProps = getDefaultFeatureProperties(level);
+    if (!draftFeature.properties) {
+      draftFeature.properties = Object.assign({}, defaultProps);
+    }
+    Object.assign(draftFeature.properties, Object.assign(Object.assign({}, defaultProps), draftFeature.properties));
+  }
+});
 const Form = ({
   defaultBbox,
   onSaveForm: _onSaveForm = () => {},
@@ -8301,6 +8311,7 @@ const Form = ({
   onFormDirty: _onFormDirty = () => {},
   isSnapshot: _isSnapshot = false
 }) => {
+  const [warningGeoJSONFeature, setWarningGeoJSONFeature] = React.useState(publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
   const {
     t
   } = useWarningsTranslation();
@@ -8347,26 +8358,19 @@ const Form = ({
   };
   const onPressClear = () => {
     reset(getEmptyPublicWarning());
+    setWarningGeoJSONFeature(undefined);
   };
   React.useEffect(() => {
     // sync redux with react-hook-form
     reset(getFormData(publicWarningDetails, object));
   }, [object, reset, publicWarningDetails]);
+  React.useEffect(() => {
+    // sync drawing on map with selected warning
+    setWarningGeoJSONFeature(publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
+  }, [publicWarningDetails]);
   const errors = getErrors(_error.message);
-  // object is used making drawing, publicWarningDetails is used when showing the dialog from the warninglist.
-  const warningGeoJSONFeature = (object === null || object === void 0 ? void 0 : object.geoJSON) || (publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
-  // Add colors, if not defined
-  const warningGeoJSONFeatureWithFillProps = produce(warningGeoJSONFeature, draft => {
-    const draftFeature = draft === null || draft === void 0 ? void 0 : draft.features[0];
-    if (draftFeature) {
-      const level = WarningLevel[publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.level] || WarningLevel[WarningLevel.moderate];
-      const defaultProps = getDefaultFeatureProperties(level);
-      if (!draftFeature.properties) {
-        draftFeature.properties = Object.assign({}, defaultProps);
-      }
-      Object.assign(draftFeature.properties, Object.assign(Object.assign({}, defaultProps), draftFeature.properties));
-    }
-  });
+  const level = WarningLevel[publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.level] || WarningLevel[WarningLevel.moderate];
+  const geoJSONFeature = getWarningGeoJSONWithColor(level, warningGeoJSONFeature);
   return jsxs(ContainerWrapper, {
     children: [jsxs(ContainerFormWrapper, Object.assign({
       isReadOnly: _isReadOnly2
@@ -8421,7 +8425,7 @@ const Form = ({
               xs: 12
             }, {
               children: jsx(WarningsMapView, {
-                geojsonFeature: warningGeoJSONFeatureWithFillProps,
+                geojsonFeature: geoJSONFeature,
                 defaultBbox: defaultBbox,
                 isSnapshot: _isSnapshot
               })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.20.2",
+  "version": "9.21.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -26,8 +26,8 @@
     "@opengeoweb/core": "*",
     "@opengeoweb/webmap": "*",
     "@opengeoweb/authentication": "*",
-    "react-i18next": "^13.5.0",
-    "i18next": "^23.7.19",
+    "react-i18next": "^14.1.2",
+    "i18next": "^23.11.5",
     "immer": "^10.0.3"
   },
   "peerDependencies": {