@opengeoweb/sigmet-airmet 5.0.1 → 5.1.1

package/index.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import React__default, { createContext, useContext, useDebugValue, forwardRef, createElement, Fragment } from 'react';
+import React__default, { createContext, version, useContext, useRef, useCallback, useDebugValue, forwardRef, createElement, Fragment } from 'react';
 import { Box as Box$2, Button, FormControlLabel, Radio, Grid, Typography, Checkbox, MenuItem, FormHelperText, useTheme as useTheme$2, Dialog, DialogTitle, DialogContent, Card, LinearProgress, List, ListItemButton, Backdrop, CircularProgress } from '@mui/material';
 import { useFormContext } from 'react-hook-form';
 import { useDraftFormHelpers, ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, isValidDate, isBefore, isBetween, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isAfter, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
@@ -8,7 +8,7 @@ import * as turf from '@turf/turf';
 import { polygonToLineString, booleanClockwise, rewind } from '@turf/turf';
 import moment from 'moment';
 import { ToggleMenu, CustomTooltip, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
-import { layerTypes, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, generateLayerId, mapActions, publicLayers, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect, DockedLayerManagerConnect } from '@opengeoweb/core';
+import { layerTypes, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, generateLayerId, mapActions, publicLayers, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect, LayerManagerConnect } from '@opengeoweb/core';
 import { Location, DrawRegion, DrawPolygon, DrawFIRLand, Delete, ChevronLeft, Edit, Success, Clock } from '@opengeoweb/theme';
 import { debounce } from 'lodash';
 import 'react-dom';
@@ -4271,12 +4271,52 @@ if (process.env.NODE_ENV === 'production') {
   withSelector.exports = withSelector_development;
 }
 
-const ReactReduxContext = /*#__PURE__*/createContext(null);
+const ContextKey = Symbol.for(`react-redux-context-${version}`);
+const gT = globalThis;
 
-if (process.env.NODE_ENV !== 'production') {
-  ReactReduxContext.displayName = 'ReactRedux';
+function getContext() {
+  let realContext = gT[ContextKey];
+
+  if (!realContext) {
+    realContext = createContext(null);
+
+    if (process.env.NODE_ENV !== 'production') {
+      realContext.displayName = 'ReactRedux';
+    }
+
+    gT[ContextKey] = realContext;
+  }
+
+  return realContext;
 }
 
+const ReactReduxContext = /*#__PURE__*/new Proxy({}, /*#__PURE__*/new Proxy({}, {
+  get(_, handler) {
+    const target = getContext(); // @ts-ignore
+
+    return (_target, ...args) => Reflect[handler](target, ...args);
+  }
+
+}));
+
+/**
+ * Hook factory, which creates a `useReduxContext` hook bound to a given context. This is a low-level
+ * hook that you should usually not need to call directly.
+ *
+ * @param {React.Context} [context=ReactReduxContext] Context passed to your `<Provider>`.
+ * @returns {Function} A `useReduxContext` hook bound to the specified context.
+ */
+function createReduxContextHook(context = ReactReduxContext) {
+  return function useReduxContext() {
+    const contextValue = useContext(context);
+
+    if (process.env.NODE_ENV !== 'production' && !contextValue) {
+      throw new Error('could not find react-redux context value; please ensure the component is wrapped in a <Provider>');
+    }
+
+    return contextValue;
+  };
+}
 /**
  * A hook to access the value of the `ReactReduxContext`. This is a low-level
  * hook that you should usually not need to call directly.
@@ -4293,15 +4333,8 @@ if (process.env.NODE_ENV !== 'production') {
  *   return <div>{store.getState()}</div>
  * }
  */
-function useReduxContext() {
-  const contextValue = useContext(ReactReduxContext);
 
-  if (process.env.NODE_ENV !== 'production' && !contextValue) {
-    throw new Error('could not find react-redux context value; please ensure the component is wrapped in a <Provider>');
-  }
-
-  return contextValue;
-}
+const useReduxContext = /*#__PURE__*/createReduxContextHook();
 
 const notInitialized = () => {
   throw new Error('uSES not initialized!');
@@ -4322,8 +4355,16 @@ const refEquality = (a, b) => a === b;
 
 
 function createSelectorHook(context = ReactReduxContext) {
-  const useReduxContext$1 = context === ReactReduxContext ? useReduxContext : () => useContext(context);
-  return function useSelector(selector, equalityFn = refEquality) {
+  const useReduxContext$1 = context === ReactReduxContext ? useReduxContext : createReduxContextHook(context);
+  return function useSelector(selector, equalityFnOrOptions = {}) {
+    const {
+      equalityFn = refEquality,
+      stabilityCheck = undefined,
+      noopCheck = undefined
+    } = typeof equalityFnOrOptions === 'function' ? {
+      equalityFn: equalityFnOrOptions
+    } : equalityFnOrOptions;
+
     if (process.env.NODE_ENV !== 'production') {
       if (!selector) {
         throw new Error(`You must pass a selector to useSelector`);
@@ -4341,9 +4382,47 @@ function createSelectorHook(context = ReactReduxContext) {
     const {
       store,
       subscription,
-      getServerState
+      getServerState,
+      stabilityCheck: globalStabilityCheck,
+      noopCheck: globalNoopCheck
     } = useReduxContext$1();
-    const selectedState = useSyncExternalStoreWithSelector(subscription.addNestedSub, store.getState, getServerState || store.getState, selector, equalityFn);
+    const firstRun = useRef(true);
+    const wrappedSelector = useCallback({
+      [selector.name](state) {
+        const selected = selector(state);
+
+        if (process.env.NODE_ENV !== 'production') {
+          const finalStabilityCheck = typeof stabilityCheck === 'undefined' ? globalStabilityCheck : stabilityCheck;
+
+          if (finalStabilityCheck === 'always' || finalStabilityCheck === 'once' && firstRun.current) {
+            const toCompare = selector(state);
+
+            if (!equalityFn(selected, toCompare)) {
+              console.warn('Selector ' + (selector.name || 'unknown') + ' returned a different result when called with the same parameters. This can lead to unnecessary rerenders.' + '\nSelectors that return a new reference (such as an object or an array) should be memoized: https://redux.js.org/usage/deriving-data-selectors#optimizing-selectors-with-memoization', {
+                state,
+                selected,
+                selected2: toCompare
+              });
+            }
+          }
+
+          const finalNoopCheck = typeof noopCheck === 'undefined' ? globalNoopCheck : noopCheck;
+
+          if (finalNoopCheck === 'always' || finalNoopCheck === 'once' && firstRun.current) {
+            // @ts-ignore
+            if (selected === state) {
+              console.warn('Selector ' + (selector.name || 'unknown') + ' returned the root state when called. This can lead to unnecessary rerenders.' + '\nSelectors that return the entire state are almost certainly a mistake, as they will cause a rerender whenever *anything* in state changes.');
+            }
+          }
+
+          if (firstRun.current) firstRun.current = false;
+        }
+
+        return selected;
+      }
+
+    }[selector.name], [selector, globalStabilityCheck, stabilityCheck]);
+    const selectedState = useSyncExternalStoreWithSelector(subscription.addNestedSub, store.getState, getServerState || store.getState, wrappedSelector, equalityFn);
     useDebugValue(selectedState);
     return selectedState;
   };
@@ -4905,7 +4984,8 @@ function shallowEqual(objA, objB) {
 
 function createStoreHook(context = ReactReduxContext) {
   const useReduxContext$1 = // @ts-ignore
-  context === ReactReduxContext ? useReduxContext : () => useContext(context);
+  context === ReactReduxContext ? useReduxContext : // @ts-ignore
+  createReduxContextHook(context);
   return function useStore() {
     const {
       store
@@ -5173,10 +5253,11 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
   })), /*#__PURE__*/React.createElement(LegendConnect, {
     showMapId: true,
     mapId: mapId
-  }), /*#__PURE__*/React.createElement(DockedLayerManagerConnect, {
+  }), /*#__PURE__*/React.createElement(LayerManagerConnect, {
     mapId: mapId,
     bounds: "parent",
-    source: "module"
+    source: "module",
+    isDocked: true
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,12 +14,12 @@
   "dependencies": {
     "@mui/material": "5.12.0",
     "@mui/system": "5.12.0",
-    "@opengeoweb/api": "5.0.1",
-    "@opengeoweb/authentication": "5.0.1",
-    "@opengeoweb/core": "5.0.1",
-    "@opengeoweb/form-fields": "5.0.1",
-    "@opengeoweb/shared": "5.0.1",
-    "@opengeoweb/theme": "5.0.1",
+    "@opengeoweb/api": "5.1.1",
+    "@opengeoweb/authentication": "5.1.1",
+    "@opengeoweb/core": "5.1.1",
+    "@opengeoweb/form-fields": "5.1.1",
+    "@opengeoweb/shared": "5.1.1",
+    "@opengeoweb/theme": "5.1.1",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
     "@reduxjs/toolkit": "1.9.5",
@@ -30,7 +30,7 @@
     "moment": "2.29.4",
     "react": "18.2.0",
     "react-hook-form": "7.41.5",
-    "react-redux": "8.0.4"
+    "react-redux": "8.1.1"
   },
   "peerDependencies": {}
 }