@opengeoweb/form-fields 9.19.0 → 9.20.1

package/index.esm.js

@@ -1,9 +1,9 @@
-import * as React from 'react';
-import React__default from 'react';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { FormControl, FormHelperText, InputLabel, Select, RadioGroup, TextField, InputAdornment } from '@mui/material';
 import { useFormContext, useController, useForm, FormProvider } from 'react-hook-form';
 import { isEqual } from 'lodash';
 import { dateUtils } from '@opengeoweb/shared';
+import * as React from 'react';
 import { DateTimePicker } from '@mui/x-date-pickers';
 import { CalendarToday } from '@opengeoweb/theme';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
@@ -328,7 +328,9 @@ var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty
   source: 'https://github.com/zloirock/core-js'
 });
 
-var store$2 = sharedStore.exports;
+var sharedStoreExports = sharedStore.exports;
+
+var store$2 = sharedStoreExports;
 
 var shared$4 = function (key, value) {
   return store$2[key] || (store$2[key] = value || {});
@@ -570,7 +572,7 @@ var functionName = {
 
 var uncurryThis$b = functionUncurryThis;
 var isCallable$a = isCallable$g;
-var store$1 = sharedStore.exports;
+var store$1 = sharedStoreExports;
 
 var functionToString = uncurryThis$b(Function.toString);
 
@@ -606,7 +608,7 @@ var global$9 = global$h;
 var isObject$4 = isObject$9;
 var createNonEnumerableProperty$4 = createNonEnumerableProperty$5;
 var hasOwn$6 = hasOwnProperty_1;
-var shared$1 = sharedStore.exports;
+var shared$1 = sharedStoreExports;
 var sharedKey$2 = sharedKey$3;
 var hiddenKeys$3 = hiddenKeys$4;
 
@@ -727,9 +729,11 @@ Function.prototype.toString = makeBuiltIn$1(function toString() {
   return isCallable$8(this) && getInternalState$2(this).source || inspectSource(this);
 }, 'toString');
 
+var makeBuiltInExports = makeBuiltIn$2.exports;
+
 var isCallable$7 = isCallable$g;
 var definePropertyModule$2 = objectDefineProperty;
-var makeBuiltIn = makeBuiltIn$2.exports;
+var makeBuiltIn = makeBuiltInExports;
 var defineGlobalProperty$1 = defineGlobalProperty$3;
 
 var defineBuiltIn$5 = function (O, key, value, options) {
@@ -1094,6 +1098,8 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
 
 function __rest(s, e) {
     var t = {};
@@ -1773,22 +1779,6 @@ const hasIntersectionWithFIR = (geojson, intersection) => {
   }
   return true;
 };
-const hasMaxFeaturePoints = (geojson, maxPoints = 7) => {
-  const hasGeometry = hasValidGeometry(geojson);
-  if (!hasGeometry) {
-    return false;
-  }
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  const {
-    coordinates,
-    type
-  } = geojson.features[0].geometry;
-  if (type === 'Polygon' && coordinates[0].length > maxPoints) {
-    return true;
-  }
-  return false;
-};
 const hasMulitpleIntersections = geojson => {
   const hasGeometry = hasValidGeometry(geojson);
   if (!hasGeometry) {
@@ -1872,7 +1862,7 @@ const ReactHookFormFormControl = _a => {
       size = 'medium'
     } = _a,
     props = __rest(_a, ["children", "errors", "isReadOnly", "sx", "className", "size"]);
-  return /*#__PURE__*/React.createElement(FormControl, Object.assign({
+  return jsxs(FormControl, Object.assign({
     fullWidth: true,
     error: !!errors,
     className: `${isReadOnly ? 'is-read-only' : ''} ${className}`,
@@ -1897,10 +1887,14 @@ const ReactHookFormFormControl = _a => {
         border: 'transparent'
       }
     }), sx)
-  }, props), children, errors && ( /*#__PURE__*/React.createElement(FormHelperText, {
-    variant: "filled",
-    role: "alert"
-  }, getErrorMessage(errors))));
+  }, props, {
+    children: [children, errors && jsx(FormHelperText, Object.assign({
+      variant: "filled",
+      role: "alert"
+    }, {
+      children: getErrorMessage(errors)
+    }))]
+  }));
 };
 
 var aCallable$1 = aCallable$3;
@@ -2027,29 +2021,35 @@ const ReactHookFormSelect = _a => {
     defaultValue
   }, defaultProps));
   const errors = getErrors(name, formErrors);
-  return /*#__PURE__*/React.createElement(ReactHookFormFormControl, {
+  return jsxs(ReactHookFormFormControl, Object.assign({
     className: className,
     sx: sx,
     disabled: disabled,
     errors: errors,
     isReadOnly: isReadOnly,
     size: size
-  }, /*#__PURE__*/React.createElement(InputLabel, {
-    variant: "filled",
-    id: labelId
-  }, label), /*#__PURE__*/React.createElement(Select, Object.assign({
-    labelId: labelId,
-    label: label,
-    inputRef: ref,
-    name: name,
-    onChange: changeEvent => {
-      onChangeField(changeEvent.target.value);
-      // default props
-      onChange(changeEvent);
-    },
-    value: value || '',
-    variant: "filled"
-  }, otherProps), children));
+  }, {
+    children: [jsx(InputLabel, Object.assign({
+      variant: "filled",
+      id: labelId
+    }, {
+      children: label
+    })), jsx(Select, Object.assign({
+      labelId: labelId,
+      label: label,
+      inputRef: ref,
+      name: name,
+      onChange: changeEvent => {
+        onChangeField(changeEvent.target.value);
+        // default props
+        onChange(changeEvent);
+      },
+      value: value || '',
+      variant: "filled"
+    }, otherProps, {
+      children: children
+    }))]
+  }));
 };
 
 const ReactHookFormRadioGroup = _a => {
@@ -2096,21 +2096,27 @@ const ReactHookFormRadioGroup = _a => {
       }
     }
   }, [errors, formErrors, name]);
-  return /*#__PURE__*/React.createElement(ReactHookFormFormControl, {
+  return jsxs(ReactHookFormFormControl, Object.assign({
     disabled: disabled,
     errors: errors,
     isReadOnly: isReadOnly
-  }, /*#__PURE__*/React.createElement(InputLabel, {
-    id: labelId
-  }, label), /*#__PURE__*/React.createElement(RadioGroup, Object.assign({
-    value: value,
-    onChange: changeEvent => {
-      onChangeField(changeEvent.target.value);
-      onChange(changeEvent, changeEvent.target.value);
-    },
-    ref: ref,
-    name: name
-  }, otherProps), children));
+  }, {
+    children: [jsx(InputLabel, Object.assign({
+      id: labelId
+    }, {
+      children: label
+    })), jsx(RadioGroup, Object.assign({
+      value: value,
+      onChange: changeEvent => {
+        onChangeField(changeEvent.target.value);
+        onChange(changeEvent, changeEvent.target.value);
+      },
+      ref: ref,
+      name: name
+    }, otherProps, {
+      children: children
+    }))]
+  }));
 };
 
 const convertTextInputValue = (value, inCapitals) => {
@@ -2151,34 +2157,36 @@ const ReactHookFormTextField = _a => {
     defaultValue
   }, defaultProps));
   const errors = getErrors(name, formErrors);
-  return /*#__PURE__*/React.createElement(ReactHookFormFormControl, {
+  return jsx(ReactHookFormFormControl, Object.assign({
     className: className,
     sx: sx,
     disabled: disabled,
     errors: errors,
     isReadOnly: isReadOnly
-  }, /*#__PURE__*/React.createElement(TextField, Object.assign({
-    label: label,
-    error: !!errors,
-    helperText: helperText,
-    value: value,
-    variant: "filled",
-    type: "text",
-    name: name,
-    onChange: evt => {
-      const {
-        value
-      } = evt.target;
-      const convertedValue = convertTextInputValue(value, upperCase);
-      onChangeField(convertedValue);
-      onChange(null);
-    },
-    disabled: disabled,
-    inputRef: ref,
-    InputProps: Object.assign(Object.assign({}, InputProps), isReadOnly && {
-      readOnly: true
-    })
-  }, otherProps)));
+  }, {
+    children: jsx(TextField, Object.assign({
+      label: label,
+      error: !!errors,
+      helperText: helperText,
+      value: value,
+      variant: "filled",
+      type: "text",
+      name: name,
+      onChange: evt => {
+        const {
+          value
+        } = evt.target;
+        const convertedValue = convertTextInputValue(value, upperCase);
+        onChangeField(convertedValue);
+        onChange(null);
+      },
+      disabled: disabled,
+      inputRef: ref,
+      InputProps: Object.assign(Object.assign({}, InputProps), isReadOnly && {
+        readOnly: true
+      })
+    }, otherProps))
+  }));
 };
 
 var wellKnownSymbol$7 = wellKnownSymbol$b;
@@ -2994,52 +3002,60 @@ const ReactHookFormNumberField = _a => {
     }
   };
   const [displayValue, setDisplayValue] = React.useState(value === null || isNaN(value) ? '' : value);
-  return /*#__PURE__*/React.createElement(ReactHookFormFormControl, {
+  return jsx(ReactHookFormFormControl, Object.assign({
     className: className,
     sx: sx,
     disabled: disabled,
     errors: errors,
     isReadOnly: isReadOnly
-  }, /*#__PURE__*/React.createElement(TextField, Object.assign({
-    label: label,
-    error: !!errors,
-    helperText: helperText,
-    inputMode: inputMode,
-    value: displayValue,
-    variant: "filled",
-    type: "text",
-    inputProps: {
-      inputMode
-    },
-    name: name,
-    size: size,
-    onChange: evt => {
-      const {
-        value
-      } = evt.target;
-      setDisplayValue(value);
-      onChangeField(convertNumericInputValue(value, inputMode));
-      onChange(null);
-    },
-    onKeyDown: onKeyDown,
-    disabled: disabled,
-    inputRef: ref,
-    // eslint-disable-next-line react/jsx-no-duplicate-props
-    InputProps: Object.assign(Object.assign(Object.assign({}, isReadOnly && {
-      readOnly: true
-    }), otherProps.InputProps), {
-      onPaste
-    })
-  }, otherProps)));
+  }, {
+    children: jsx(TextField, Object.assign({
+      label: label,
+      error: !!errors,
+      helperText: helperText,
+      inputMode: inputMode,
+      value: displayValue,
+      variant: "filled",
+      type: "text",
+      inputProps: {
+        inputMode
+      },
+      name: name,
+      size: size,
+      onChange: evt => {
+        const {
+          value
+        } = evt.target;
+        setDisplayValue(value);
+        onChangeField(convertNumericInputValue(value, inputMode));
+        onChange(null);
+      },
+      onKeyDown: onKeyDown,
+      disabled: disabled,
+      inputRef: ref,
+      // eslint-disable-next-line react/jsx-no-duplicate-props
+      InputProps: Object.assign(Object.assign(Object.assign({}, isReadOnly && {
+        readOnly: true
+      }), otherProps.InputProps), {
+        onPaste
+      })
+    }, otherProps))
+  }));
 };
 
-const OpenPicker = () => /*#__PURE__*/React.createElement(CalendarToday, null);
+const OpenPicker = () => jsx(CalendarToday, {});
 const getTimezoneOffset = value => value.getTimezoneOffset() * 60000;
 const makeLocalAppearUTC = value => new Date(value.getTime() + getTimezoneOffset(value));
 const localToUTC = dateTime => new Date(dateTime.getTime() - getTimezoneOffset(dateTime));
-const getFormattedValue = value => {
+/**
+ * Should return an isostring in the form "YYYY-MM-DDThh:mm:ssZ";
+ * The milli seconds section should not be included, strictly YYYY-MM-DDThh:mm:ssZ is important
+ * @param value input Date
+ * @returns iso string in YYYY-MM-DDThh:mm:ssZ format.
+ */
+const getFormattedValueForDatePicker = value => {
   var _a;
-  return (_a = dateUtils.dateToIsoString(value)) !== null && _a !== void 0 ? _a : null;
+  return (_a = dateUtils.dateToString(value, "yyyy-MM-dd'T'HH:mm:ss'Z'", true)) !== null && _a !== void 0 ? _a : null;
 };
 const getDateValue = value => {
   var _a, _b;
@@ -3096,71 +3112,75 @@ const ReactHookKeyboardDateTimePicker = _a => {
   const now = makeLocalAppearUTC(dateUtils.utc());
   const minDateTime = disablePast ? now : null;
   const maxDateTime = disableFuture ? now : null;
-  return /*#__PURE__*/React.createElement(ReactHookFormFormControl, {
+  return jsx(ReactHookFormFormControl, Object.assign({
     disabled: disabled,
     errors: errors,
     className: className,
     sx: sx,
     isReadOnly: isReadOnly
-  }, /*#__PURE__*/React.createElement(DateTimePicker, Object.assign({
-    desktopModeMediaQuery: "@media (min-width: 720px)",
-    ampm: false,
-    format: format,
-    label: label,
-    value: dateValue,
-    openTo: openTo,
-    disabled: disabled,
-    onChange: value => {
-      if (!value) {
-        onChange(null);
-        onChangeField(null);
-        return;
-      }
-      const formattedDate = getFormattedValue(localToUTC(value));
-      onChangeField(formattedDate);
-      onChange(formattedDate);
-    },
-    inputRef: ref,
-    slotProps: {
-      textField: Object.assign({
-        variant: 'filled',
-        helperText,
-        error: !!errors,
-        name,
-        placeholder: disabled ? '' : format.toLowerCase(),
-        InputProps: Object.assign({}, !shouldHideUTC && {
-          endAdornment: ( /*#__PURE__*/React.createElement(InputAdornment, {
-            style: {
-              paddingTop: '16px'
-            },
-            position: "end"
-          }, "UTC"))
+  }, {
+    children: jsx(DateTimePicker, Object.assign({
+      desktopModeMediaQuery: "@media (min-width: 720px)",
+      ampm: false,
+      format: format,
+      label: label,
+      value: dateValue,
+      openTo: openTo,
+      disabled: disabled,
+      onChange: value => {
+        if (!value) {
+          onChange(null);
+          onChangeField(null);
+          return;
+        }
+        const formattedDate = getFormattedValueForDatePicker(localToUTC(value));
+        onChangeField(formattedDate);
+        onChange(formattedDate);
+      },
+      inputRef: ref,
+      slotProps: {
+        textField: Object.assign({
+          variant: 'filled',
+          helperText,
+          error: !!errors,
+          name,
+          placeholder: disabled ? '' : format.toLowerCase(),
+          InputProps: Object.assign({}, !shouldHideUTC && {
+            endAdornment: jsx(InputAdornment, Object.assign({
+              style: {
+                paddingTop: '16px'
+              },
+              position: "end"
+            }, {
+              children: "UTC"
+            }))
+          }),
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          'data-testid': otherProps['data-testid']
+        }, isReadOnly && {
+          readOnly: true
         }),
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        'data-testid': otherProps['data-testid']
-      }, isReadOnly && {
-        readOnly: true
-      }),
-      inputAdornment: Object.assign({}, inputAdornment || {
-        position: 'start'
-      }),
-      openPickerButton: {
-        size: 'small',
-        sx: {
-          padding: 0
+        inputAdornment: Object.assign({}, inputAdornment || {
+          position: 'start'
+        }),
+        openPickerButton: {
+          size: 'small',
+          sx: {
+            padding: 0
+          }
         }
-      }
-    },
-    slots: {
-      openPickerIcon: OpenPicker
-    },
-    timeSteps: {
-      minutes: 1
-    },
-    minDateTime: minDateTime,
-    maxDateTime: maxDateTime
-  }, otherProps)));
+      },
+      slots: {
+        openPickerIcon: OpenPicker
+      },
+      timeSteps: {
+        minutes: 1
+      },
+      minDateTime: minDateTime,
+      maxDateTime: maxDateTime
+    }, otherProps))
+  }));
 };
 
 const defaultFormOptions = {
@@ -3175,16 +3195,22 @@ const ReactHookFormProvider = ({
   // added this ignore as the build is failing otherwise on: Type instantiation is excessively deep and possibly infinite.
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  return /*#__PURE__*/React__default.createElement(FormProvider, Object.assign({}, formMethods), children);
+  return jsx(FormProvider, Object.assign({}, formMethods, {
+    children: children
+  }));
 };
 const ReactHookFormProviderWrapper = ({
   children,
   options: _options2 = defaultFormOptions
-}) => ( /*#__PURE__*/React__default.createElement(LocalizationProvider, {
+}) => jsx(LocalizationProvider, Object.assign({
   dateAdapter: AdapterDateFns
-}, /*#__PURE__*/React__default.createElement(ReactHookFormProvider, {
-  options: _options2
-}, children)));
+}, {
+  children: jsx(ReactHookFormProvider, Object.assign({
+    options: _options2
+  }, {
+    children: children
+  }))
+}));
 
 const ReactHookFormHiddenInput = _a => {
   var {
@@ -3204,9 +3230,9 @@ const ReactHookFormHiddenInput = _a => {
     rules,
     defaultValue
   }, defaultProps));
-  return field.value !== null ? ( /*#__PURE__*/React.createElement("input", Object.assign({}, field, {
+  return field.value !== null ? jsx("input", Object.assign({}, field, {
     type: "hidden"
-  }, props))) : null;
+  }, props)) : null;
 };
 
 // hidden input helpers, should not be part of send formdata
@@ -3233,9 +3259,9 @@ const useDraftFormHelpers = (isDefaultDraft = false) => {
   const toggleIsDraft = isDraft => setValue(HIDDEN_INPUT_HELPER_IS_DRAFT, isDraft, {
     shouldDirty: false
   });
-  const DraftFieldHelper = () => ( /*#__PURE__*/React.createElement("input", Object.assign({}, register(HIDDEN_INPUT_HELPER_IS_DRAFT), {
+  const DraftFieldHelper = () => jsx("input", Object.assign({}, register(HIDDEN_INPUT_HELPER_IS_DRAFT), {
     type: "hidden"
-  })));
+  }));
   return {
     isRequired,
     toggleIsDraft,
@@ -3244,4 +3270,4 @@ const useDraftFormHelpers = (isDefaultDraft = false) => {
   };
 };
 
-export { HIDDEN_INPUT_HELPER_IS_DRAFT, ReactHookKeyboardDateTimePicker as ReactHookFormDateTime, ReactHookFormFormControl, ReactHookFormHiddenInput, ReactHookFormNumberField, ReactHookFormProviderWrapper as ReactHookFormProvider, ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormTextField, defaultFormOptions, errorMessages, getDateValue, getDeepProperty, getFormattedValue, hasIntersectionWithFIR, hasMaxFeaturePoints, hasMulitpleIntersections, isEmpty, isGeometryDirty, isInteger, isLatitude, isLongitude, isMaximumOneDrawing, isNonOrBothCoordinates, isValidGeoJsonCoordinates, isValidMax, isValidMin, isXHoursAfter, isXHoursBefore, useDraftFormHelpers };
+export { HIDDEN_INPUT_HELPER_IS_DRAFT, ReactHookKeyboardDateTimePicker as ReactHookFormDateTime, ReactHookFormFormControl, ReactHookFormHiddenInput, ReactHookFormNumberField, ReactHookFormProviderWrapper as ReactHookFormProvider, ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormTextField, defaultFormOptions, errorMessages, getDateValue, getDeepProperty, getFormattedValueForDatePicker, hasIntersectionWithFIR, hasMulitpleIntersections, hasValidGeometry, isEmpty, isGeometryDirty, isInteger, isLatitude, isLongitude, isMaximumOneDrawing, isNonOrBothCoordinates, isValidGeoJsonCoordinates, isValidMax, isValidMin, isXHoursAfter, isXHoursBefore, useDraftFormHelpers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/form-fields",
-  "version": "9.19.0",
+  "version": "9.20.1",
   "description": "GeoWeb form-fields library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,7 +13,7 @@
     "react-hook-form": "^7.50.1",
     "@mui/x-date-pickers": "^6.18.5",
     "lodash": "^4.17.21",
-    "@opengeoweb/shared": "9.19.0"
+    "@opengeoweb/shared": "9.20.1"
   },
   "peerDependencies": {
     "react": "18"
@@ -21,4 +21,4 @@
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js"
-}
+}

package/src/lib/components/ReactHookFormDateTime.d.ts

@@ -2,7 +2,13 @@ import * as React from 'react';
 import { SxProps, Theme } from '@mui/material';
 import { DateTimePickerProps, DateTimePickerSlotsComponentsProps } from '@mui/x-date-pickers';
 import { ReactHookFormInput } from './types';
-export declare const getFormattedValue: (value: Date) => string | null;
+/**
+ * Should return an isostring in the form "YYYY-MM-DDThh:mm:ssZ";
+ * The milli seconds section should not be included, strictly YYYY-MM-DDThh:mm:ssZ is important
+ * @param value input Date
+ * @returns iso string in YYYY-MM-DDThh:mm:ssZ format.
+ */
+export declare const getFormattedValueForDatePicker: (value: Date) => string | null;
 export declare const getDateValue: (value: string) => Date | null;
 type ReactHookKeyboardDateTimePickerProps = DateTimePickerProps<Date> & DateTimePickerSlotsComponentsProps<Date> & ReactHookFormInput<{
     defaultNullValue?: string | null;

package/src/lib/components/index.d.ts

@@ -8,5 +8,5 @@ export * from './ReactHookFormDateTime';
 export { default as ReactHookFormProvider } from './ReactHookFormProvider';
 export { default as ReactHookFormHiddenInput } from './ReactHookFormHiddenInput';
 export { defaultFormOptions } from './ReactHookFormProvider';
-export { errorMessages, isMaximumOneDrawing, isGeometryDirty, isValidGeoJsonCoordinates, hasIntersectionWithFIR, isValidMax, isValidMin, isInteger, hasMaxFeaturePoints, hasMulitpleIntersections, isLatitude, isLongitude, isNonOrBothCoordinates, isEmpty, isXHoursAfter, isXHoursBefore, } from './utils';
+export { errorMessages, isMaximumOneDrawing, hasValidGeometry, isGeometryDirty, isValidGeoJsonCoordinates, hasIntersectionWithFIR, isValidMax, isValidMin, isInteger, hasMulitpleIntersections, isLatitude, isLongitude, isNonOrBothCoordinates, isEmpty, isXHoursAfter, isXHoursBefore, } from './utils';
 export { getDeepProperty } from './formUtils';

package/src/lib/components/utils.d.ts

@@ -28,7 +28,6 @@ export declare const hasValidGeometry: (geojson?: GeoJSON.FeatureCollection | nu
 export declare const isValidGeoJsonCoordinates: (geojson: GeoJSON.FeatureCollection) => boolean;
 export declare const isMaximumOneDrawing: (geojson: GeoJSON.FeatureCollection) => boolean;
 export declare const hasIntersectionWithFIR: (geojson: GeoJSON.FeatureCollection, intersection: GeoJSON.FeatureCollection) => boolean;
-export declare const hasMaxFeaturePoints: (geojson: GeoJSON.FeatureCollection, maxPoints?: number) => boolean;
 export declare const hasMulitpleIntersections: (geojson: GeoJSON.FeatureCollection) => boolean;
 export declare const isGeometryDirty: (geoJSON?: GeoJSON.FeatureCollection | null, formGeoJSON?: GeoJSON.FeatureCollection | null) => boolean;
 export declare const isInteger: (value: number) => boolean;