@luomus/laji-form 15.1.24 → 15.1.26

package/lib/utils.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bsSizeToPixels = exports.canAdd = exports.stringifyKeyCombo = exports.decapitalizeFirstLetter = exports.capitalizeFirstLetter = exports.getKeyHandlerTargetId = exports.isDescendant = exports.getBootstrapCols = exports.getNestedUiFieldsList = exports.updateTailUiSchema = exports.getNestedTailUiSchema = exports.keyboardClick = exports.formDataEquals = exports.formDataIsEmpty = exports.filterItemIdsDeeply = exports.filterItemId = exports.filterLajiFormId = exports.syncScroll = exports._syncScroll = exports.shouldSyncScroll = exports.focusAndScroll = exports.focusById = exports.getSchemaElementById = exports.findNearestParentSchemaElemId = exports.focusNextInput = exports.getNextInput = exports.getNextInputInInputs = exports.ReactUtils = exports.findNearestParentTabbableElem = exports.findNearestParentSchemaElem = exports.canFocusNextInput = exports.isTabbableInput = exports.getTabbableFields = exports.isSelect = exports.isMultiSelect = exports.getReactComponentName = exports.parseJSONPointer = exports.isEmptyString = exports.isNullOrUndefined = exports.getInnerUiSchema = exports.getUiOptions = exports.immutableDelete = exports.getUpdateObjectFromJSONPointer = exports.getUpdateObjectFromJSONPath = exports.propertyHasData = exports.hasData = exports.getDefaultFormState = exports.isDefaultData = exports.isHidden = exports.isObject = void 0;
-exports.translate = exports.classNames = exports.getTitle = exports.toJSONPointer = exports.getReversedFormDataIndex = exports.getFormDataIndex = exports.getIdxWithoutOffset = exports.getIdxWithOffset = exports.constructTranslations = exports.filteredErrors = exports.highlightElem = exports.findPointerForLajiFormId = exports.removeLajiFormIds = exports.getAllLajiFormIdsDeeply = exports.addLajiFormIds = exports.getFieldUUID = exports.getUUID = exports.assignUUID = exports.updateFormDataWithJSONPointer = exports.uiSchemaJSONPointer = exports.schemaJSONPointer = exports.idSchemaIdToJSONPointer = exports.JSONPointerToId = exports.checkJSONPointer = exports.parseUiSchemaFromFormDataPointer = exports.parseSchemaFromFormDataPointer = exports.triggerParentComponent = exports.bringRemoteFormData = exports.checkArrayRules = exports.checkRules = exports.formatErrorMessage = exports.formatValue = exports.dictionarify = exports.injectButtons = exports.updateSafelyWithJSONPointer = exports.updateSafelyWithJSONPath = exports.filter = exports.scrollIntoViewIfNeeded = exports.getScrollPositionForScrollIntoViewIfNeeded = exports.getWindowScrolled = exports.applyFunction = exports.pixelsToBsSize = void 0;
+exports.useBooleanSetter = exports.translate = exports.classNames = exports.getTitle = exports.toJSONPointer = exports.getReversedFormDataIndex = exports.getFormDataIndex = exports.getIdxWithoutOffset = exports.getIdxWithOffset = exports.constructTranslations = exports.filteredErrors = exports.highlightElem = exports.findPointerForLajiFormId = exports.removeLajiFormIds = exports.getAllLajiFormIdsDeeply = exports.addLajiFormIds = exports.getFieldUUID = exports.getUUID = exports.assignUUID = exports.updateFormDataWithJSONPointer = exports.uiSchemaJSONPointer = exports.schemaJSONPointer = exports.idSchemaIdToJSONPointer = exports.JSONPointerToId = exports.checkJSONPointer = exports.parseUiSchemaFromFormDataPointer = exports.parseSchemaFromFormDataPointer = exports.triggerParentComponent = exports.bringRemoteFormData = exports.checkArrayRules = exports.checkRules = exports.formatErrorMessage = exports.formatValue = exports.dictionarify = exports.injectButtons = exports.updateSafelyWithJSONPointer = exports.updateSafelyWithJSONPath = exports.filter = exports.scrollIntoViewIfNeeded = exports.getScrollPositionForScrollIntoViewIfNeeded = exports.getWindowScrolled = exports.applyFunction = exports.pixelsToBsSize = void 0;
 const React = require("react");
 const react_dom_1 = require("react-dom");
 const utils_1 = require("@rjsf/utils");
@@ -138,12 +138,14 @@ function getUiOptions(container) {
     return {};
 }
 exports.getUiOptions = getUiOptions;
-function getInnerUiSchema(parentUiSchema) {
-    let _a = parentUiSchema || {}, { uiSchema } = _a, restOfUiSchema = __rest(_a, ["uiSchema"]);
-    if (uiSchema && (Context_1.default("VIRTUAL_SCHEMA_NAMES")[uiSchema["ui:field"]] || Context_1.default("SCHEMA_FIELD_WRAPPERS")[uiSchema["ui:field"]]) && parentUiSchema["ui:buttons"]) {
+function getInnerUiSchema(parentUiSchema = {}) {
+    let { uiSchema } = parentUiSchema, restOfUiSchema = __rest(parentUiSchema, ["uiSchema"]);
+    if (uiSchema
+        && (Context_1.default("VIRTUAL_SCHEMA_NAMES")[uiSchema["ui:field"]]
+            || Context_1.default("SCHEMA_FIELD_WRAPPERS")[uiSchema["ui:field"]]) && parentUiSchema["ui:buttons"]) {
         uiSchema = Object.assign(Object.assign({}, uiSchema), { "ui:buttons": [
                 ...(uiSchema["ui:buttons"] || []),
-                ...parentUiSchema["ui:buttons"]
+                ...(parentUiSchema["ui:buttons"] || [])
             ] });
     }
     return Object.assign(Object.assign(Object.assign({}, restOfUiSchema), { "ui:field": undefined, "ui:settings": undefined, "ui:options": uiSchema ? undefined : restOfUiSchema["ui:options"], "ui:buttons": uiSchema ? undefined : parentUiSchema["ui:buttons"] }), (uiSchema || {}));
@@ -436,10 +438,9 @@ const formDataEquals = (f1, f2, context, id) => {
     return _formDataEquals(context)(f1, f2, id);
 };
 exports.formDataEquals = formDataEquals;
-const _keyboardClick = ({ contextId }) => (fn) => {
+const _keyboardClick = ({ contextId }) => (fn, keys = [" ", "Enter"]) => {
     return (e) => {
         var _a, _b;
-        let keys = [" ", "Enter"];
         if ((_b = (_a = e.target) === null || _a === void 0 ? void 0 : _a.matches) === null || _b === void 0 ? void 0 : _b.call(_a, tabbableSelectorsQuery)) {
             const { shortcuts } = Context_1.default(contextId);
             keys = keys.filter(k => !(shortcuts === null || shortcuts === void 0 ? void 0 : shortcuts[k]));
@@ -1183,3 +1184,14 @@ function translate(translations, key, params) {
     return Object.keys(params || {}).reduce((translated, param) => translated.replace(new RegExp(`%{${param}}`, "g"), (params === null || params === void 0 ? void 0 : params[param]) || ""), translations[key]);
 }
 exports.translate = translate;
+/**
+ * @param value the default value of the setter
+ * @returns [stateValue, setTrue, setFalse]
+ */
+function useBooleanSetter(value) {
+    const [open, setOpen] = React.useState(value);
+    const setTrue = React.useCallback(() => setOpen(true), []);
+    const setFalse = React.useCallback(() => setOpen(false), []);
+    return [open, setTrue, setFalse];
+}
+exports.useBooleanSetter = useBooleanSetter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.24",
+  "version": "15.1.26",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,10 +35,10 @@
     "luomus"
   ],
   "author": "Olli Raitio <olli.raitio@helsinki.fi>",
-  "repository": "https://github.com/luomus/laji-form.git",
+  "repository": "git+https://github.com/luomus/laji-form.git",
   "license": "MIT",
   "dependencies": {
-    "@luomus/laji-map": "^5.0.2",
+    "@luomus/laji-map": "^5.1.2",
     "@luomus/laji-validate": "^0.0.121",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",

package/test-export/test-utils.js

@@ -39,8 +39,8 @@ function getEnumWidgetForContainer($container) {
     return {
         $container,
         openEnums: () => $container.click(),
-        $enumContainer: $container.locator(".rw-popup-container"),
-        $$enums: $container.locator(".rw-list-option"),
+        $enumContainer: $container.locator(".lajii-form-dropdown"),
+        $$enums: $container.locator(".laji-form-dropdown-item"),
         $input: $container.locator("input")
     };
 }
@@ -140,7 +140,7 @@ class Form {
             const $namedPlaceChooserModal = this.page.locator(".named-place-chooser-modal");
             const $mapPopupContainer = this.page.locator(".named-place-popup");
             return {
-                select: getEnumWidgetForContainer(this.page.locator("#named-place-chooser-select")),
+                select: getEnumWidgetForContainer($namedPlaceChooserModal.locator(".laji-form-dropdown-container")),
                 mapPopup: {
                     $container: $mapPopupContainer,
                     $useBtn: $mapPopupContainer.locator(".btn-default")
@@ -210,7 +210,7 @@ class Form {
         return this.$locate(str).locator("textarea");
     }
     $getEnumWidget(str) {
-        const $container = this.$locate(str).locator(".rw-combobox");
+        const $container = this.$locate(str).locator(".laji-form-dropdown-container");
         return getEnumWidgetForContainer($container);
     }
     getDateWidget(str) {