@k-int/stripes-kint-components 5.29.1 → 5.31.0

package/es/lib/hooks/typedownHooks/useTypedown.js

@@ -8,97 +8,120 @@ var _react = require("react");
 var _reactResizeDetector = require("react-resize-detector");
 var _components = require("@folio/stripes/components");
 var _eventCodes = require("../../constants/eventCodes");
-var _selectorSafe = _interopRequireDefault(require("../../utils/selectorSafe"));
 var _useTypedownToggle = _interopRequireDefault(require("./useTypedownToggle"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const useTypedown = function (name) {
   let {
     timeout = 800
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  // SEARCHFIELD COMPONENT
-  const searchFieldComponent = document.getElementById("typedown-searchField-".concat((0, _selectorSafe.default)(name)));
+  // SET UP STATE HOLDING DOM ELEMENTS
+  const [list, setListElement] = (0, _react.useState)();
+  const [trigger, setTriggerElement] = (0, _react.useState)();
+  const [footer, setFooterElement] = (0, _react.useState)();
+  const [header, setHeaderElement] = (0, _react.useState)();
 
   // SET UP REFS
-  const listRef = (0, _react.useRef)();
   const triggerRef = (0, _react.useRef)();
   const overlayRef = (0, _react.useRef)();
-  const footerRef = (0, _react.useRef)();
-  const footer = document.getElementById("typedown-footer-".concat((0, _selectorSafe.default)(name)));
-  // Add an event listener to the footer, so that we can control tab behaviour between footer elements
+  const listRef = (0, _react.useCallback)(node => setListElement(node), []);
+  const triggerComponentRef = (0, _react.useCallback)(node => setTriggerElement(node), []);
+  const footerRef = (0, _react.useCallback)(node => setFooterElement(node), []);
+  const headerRef = (0, _react.useCallback)(node => setHeaderElement(node), []);
+  (0, _react.useEffect)(() => {
+    const configs = [
+    // --- HEADER CONFIG ---
+    {
+      element: header,
+      allowTabThroughContents: true,
+      previousElement: trigger,
+      nextElement: (footer && (0, _components.getFirstFocusable)(footer)) ?? (0, _components.getNextFocusable)(trigger, false),
+      downElement: list && (0, _components.getFirstFocusable)(list),
+      upElement: list && (0, _components.getLastFocusable)(list)
+    },
+    // --- FOOTER CONFIG ---
+    {
+      element: footer,
+      allowTabThroughContents: true,
+      previousElement: (header && (0, _components.getLastFocusable)(header)) ?? trigger,
+      nextElement: (0, _components.getNextFocusable)(trigger, false),
+      downElement: list && (0, _components.getFirstFocusable)(list),
+      upElement: list && (0, _components.getLastFocusable)(list)
+    },
+    // --- LIST/CONTAINER CONFIG ---
+    {
+      element: list,
+      allowUpDownThroughContents: true,
+      previousElement: (header && (0, _components.getLastFocusable)(header)) ?? trigger,
+      nextElement: (footer && (0, _components.getFirstFocusable)(footer)) ?? (0, _components.getNextFocusable)(trigger, false)
+    },
+    // --- TRIGGER CONFIG ---
+    {
+      element: trigger,
+      nextElement: (header && (0, _components.getFirstFocusable)(header)) ?? (footer && (0, _components.getFirstFocusable)(footer)) ?? (0, _components.getNextFocusable)(trigger, false),
+      previousElement: (0, _components.getPreviousFocusable)(trigger, false),
+      downElement: list && (0, _components.getFirstFocusable)(list),
+      upElement: list && (0, _components.getLastFocusable)(list)
+    }].filter(c => c.element); // Filter out configs where the element (e.g., header) is null
 
-  if (footer && footer.getAttribute('hasListener') !== 'true') {
-    footer.addEventListener('keydown', e => {
-      // We want special behaviour on tab
-      if (e.code === _eventCodes.TAB) {
-        // Prevent the default behaviour
-        e.preventDefault();
-        const focusFunc = e.shiftKey ? _components.getPreviousFocusable : _components.getNextFocusable;
-        const elem = focusFunc(footerRef.current, true, true, false, true);
-        if (elem) {
-          // Focus on next focusable element
-          elem.focus();
-        } else if (e.shiftKey) {
-          // We are at the beginning of the list, refocus on search bar
-          searchFieldComponent.focus();
-        } else {
-          // We are at the end of the list, move onto next focusable element in page
-          (0, _components.getNextFocusable)(searchFieldComponent, false).focus();
+    const cleanups = [];
+    const setupListener = config => {
+      const handler = e => {
+        if (e.code === _eventCodes.TAB) {
+          e.preventDefault();
+          if (config.allowTabThroughContents) {
+            const focusFunc = e.shiftKey ? _components.getPreviousFocusable : _components.getNextFocusable;
+            const elem = focusFunc(config.element, true, true, false, true);
+            if (elem) {
+              // Focus on next focusable element
+              elem.focus();
+            } else if (e.shiftKey) {
+              // We are at the beginning of the list moving backwards, focus on the previous element
+              config.previousElement.focus();
+            } else {
+              // We are at the end of the list, move onto next focusable element in page
+              config.nextElement.focus();
+            }
+          } else if (e.shiftKey) {
+            config.previousElement.focus();
+          } else {
+            config.nextElement.focus();
+          }
+        } else if (e.code === _eventCodes.DOWN_ARROW || e.code === _eventCodes.UP_ARROW) {
+          e.preventDefault();
+          // Prevent the default behaviour
+          e.preventDefault();
+          if (config.allowUpDownThroughContents) {
+            const focusFunc = e.code === _eventCodes.UP_ARROW ? _components.getPreviousFocusable : _components.getNextFocusable;
+            const elem = focusFunc(config.element, true, true, true, true); // Allow looping through elements
+            if (elem) {
+              elem.focus();
+            }
+          } else if (e.code === _eventCodes.UP_ARROW) {
+            config.upElement.focus();
+          } else {
+            config.downElement.focus();
+          }
         }
-      }
-    });
-    footer.setAttribute('hasListener', 'true');
-  }
+      };
 
-  // SET UP HANDLERS
-  const searchFieldKeyDownHandler = e => {
-    if (e.code === _eventCodes.UP_ARROW) {
-      const elem = (0, _components.getLastFocusable)(listRef.current, true, true);
-      if (elem) {
-        elem.focus();
-      }
-    }
-    if (e.code === _eventCodes.DOWN_ARROW) {
-      const elem = (0, _components.getFirstFocusable)(listRef.current, true, true);
-      if (elem) {
-        elem.focus();
-      }
-    }
+      // Add event listener and add the removal of said event listener to the cleanup function
+      config.element.addEventListener('keydown', handler);
+      cleanups.push(() => config.element.removeEventListener('keydown', handler));
+    };
 
-    // Tab key (But not while shifting)
-    if (e.code === _eventCodes.TAB && !e.shiftKey) {
-      e.preventDefault();
-      // If we have focusable elements in the footer, then focus on them, else unfocus searchbar
-      const elem = (0, _components.getNextFocusable)(footerRef.current, true, true, true, true);
-      if (elem) {
-        elem.focus();
-      } else {
-        (0, _components.getNextFocusable)(searchFieldComponent, false).focus();
-      }
-    }
-  };
-  const listKeyDownHandler = e => {
-    if (e.code === _eventCodes.DOWN_ARROW) {
-      const elem = (0, _components.getNextFocusable)(listRef.current, true, true);
-      elem.focus();
-    }
-    if (e.code === _eventCodes.UP_ARROW) {
-      const elem = (0, _components.getPreviousFocusable)(listRef.current, true, true);
-      elem.focus();
-    }
-    if (e.code === _eventCodes.TAB) {
-      e.preventDefault();
-      let elem;
-      if (!e.shiftKey && !footerRef.current) {
-        elem = (0, _components.getNextFocusable)(searchFieldComponent, false);
-      } else if (!e.shiftKey) {
-        elem = (0, _components.getNextFocusable)(footerRef.current, true, true, true, true);
-      } else {
-        elem = searchFieldComponent;
-      }
-      elem.focus();
-    }
-  };
-  const handleNextFocus = () => (0, _components.getNextFocusable)(searchFieldComponent, false).focus();
+    // Setup the event listener for each config entry
+    configs.forEach(setupListener);
+
+    // Cleanup any event listeners
+    return () => {
+      cleanups.forEach(cleanup => cleanup());
+    };
+
+    // Re-add the listener ANY time any of the elements changes (this is why we're using callback refs)
+  }, [header, trigger, footer, list]);
+
+  // TODO is this still necessary?
+  const handleNextFocus = () => (0, _components.getNextFocusable)(trigger, false).focus();
 
   // SET UP VARIABLES
   const {
@@ -127,13 +150,13 @@ const useTypedown = function (name) {
     refs: {
       listRef,
       triggerRef,
+      triggerComponentRef,
       overlayRef,
-      footerRef
+      footerRef,
+      headerRef
     },
     handlers: {
-      handleNextFocus,
-      listKeyDownHandler,
-      searchFieldKeyDownHandler
+      handleNextFocus
     },
     variables: {
       open: useOpen ? open : false,

package/es/lib/hooks/typedownHooks/useTypedownToggle.js

@@ -18,8 +18,8 @@ const useTypedownToggle = name => {
   } = (0, _useActiveElement.default)();
 
   // Trawl up element stack and check if a typedown-parent exists, use that to toggle
-  const openBool = !open && hasParent("typedown-parent-".concat((0, _selectorSafe.default)(name)));
-  const closeBool = open && !hasParent("typedown-parent-".concat((0, _selectorSafe.default)(name)));
+  const openBool = !open && hasParent(`typedown-parent-${(0, _selectorSafe.default)(name)}`);
+  const closeBool = open && !hasParent(`typedown-parent-${(0, _selectorSafe.default)(name)}`);
   (0, _react.useEffect)(() => {
     if (openBool || closeBool) {
       onToggle();

package/es/lib/hooks/useActionListRef.js

@@ -13,7 +13,7 @@ const useActionListRef = () => {
   const passedRef = (0, _react.useCallback)(node => {
     // All functions must be present on here
     actionListRef.current = node;
-    if (node !== null && node !== void 0 && node.editing) {
+    if (node?.editing) {
       setEditing(node.editing);
     } else {
       setEditing();

package/es/lib/hooks/useActiveElement.js

@@ -11,7 +11,7 @@ const useActiveElement = () => {
     setActive(document.activeElement);
   };
   const hasParent = id => {
-    return active.closest("[id^=".concat(id, "]")) !== null;
+    return active.closest(`[id^=${id}]`) !== null;
   };
   (0, _react.useEffect)(() => {
     document.addEventListener('focusin', handleFocusIn);

package/es/lib/hooks/useCustomProperties.js

@@ -9,11 +9,6 @@ var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const useCustomProperties = _ref => {
   let {
     endpoint,
@@ -26,7 +21,7 @@ const useCustomProperties = _ref => {
     returnQueryObject = false
   } = _ref;
   const ky = (0, _core.useOkapiKy)();
-  const custPropOptions = _objectSpread({
+  const custPropOptions = {
     searchKey: 'label,name,description',
     filterKeys: {
       ContextKey: 'ctx'
@@ -38,14 +33,15 @@ const useCustomProperties = _ref => {
     }],
     filters: [],
     stats: false,
-    max: 100
-  }, options);
+    max: 100,
+    ...options
+  };
   if (Array.isArray(ctx)) {
     // If we have an array, append a context filter for each ctx given
 
     // Special case if one is isNull
     custPropOptions.filters.push({
-      values: ctx.map(c => c === 'isNull' ? 'ctx isNull' : "ctx==".concat(c))
+      values: ctx.map(c => c === 'isNull' ? 'ctx isNull' : `ctx==${c}`)
     });
   } else if (ctx === 'isNull') {
     // isNull is a special case
@@ -59,7 +55,7 @@ const useCustomProperties = _ref => {
     });
   }
   const query = (0, _utils.generateKiwtQuery)(custPropOptions, nsValues);
-  const path = "".concat(endpoint).concat(query);
+  const path = `${endpoint}${query}`;
   const queryObject = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useCustomProperties', 'custprops', ctx, path], () => ky(path).json(), queryParams);
   if (returnQueryObject) {
     return queryObject || {};

package/es/lib/hooks/useHelperApp.js

@@ -10,18 +10,13 @@ var _queryString = _interopRequireDefault(require("query-string"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const useHelperApp = helpers => {
   const history = (0, _reactRouterDom.useHistory)();
   const location = (0, _reactRouterDom.useLocation)();
   const [helperObject, setHelperObject] = (0, _react.useState)({});
   const [helperToggleFunctions, setHelperToggleFunctions] = (0, _react.useState)({});
   const query = _queryString.default.parse(location.search);
-  const [currentHelper, setCurrentHelper] = (0, _react.useState)(query === null || query === void 0 ? void 0 : query.helper);
+  const [currentHelper, setCurrentHelper] = (0, _react.useState)(query?.helper);
   const handleToggleHelper = (0, _react.useCallback)(helper => {
     setCurrentHelper(helper !== currentHelper ? helper : undefined);
   }, [currentHelper]);
@@ -40,13 +35,14 @@ const useHelperApp = helpers => {
       // This makes sure adding/removing helpers changes the functions
       setHelperToggleFunctions(newHelperToggleFunctions);
     }
-    if (currentHelper !== (query === null || query === void 0 ? void 0 : query.helper)) {
-      const newQuery = _objectSpread(_objectSpread({}, query), {}, {
+    if (currentHelper !== query?.helper) {
+      const newQuery = {
+        ...query,
         helper: currentHelper
-      });
+      };
       history.push({
         pathname: location.pathname,
-        search: "?".concat(_queryString.default.stringify(newQuery))
+        search: `?${_queryString.default.stringify(newQuery)}`
       });
 
       // When helper changes, reset helperToggleFunctions
@@ -56,14 +52,15 @@ const useHelperApp = helpers => {
 
   // Set the HelperComponent
   const HelperComponent = (0, _react.useCallback)(props => {
-    if (!(query !== null && query !== void 0 && query.helper)) return null;
+    if (!query?.helper) return null;
     let Component = null;
-    Component = helperObject[query === null || query === void 0 ? void 0 : query.helper];
+    Component = helperObject[query?.helper];
     if (!Component) return null;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({
-      onToggle: () => handleToggleHelper(query === null || query === void 0 ? void 0 : query.helper)
-    }, props));
-  }, [handleToggleHelper, helperObject, query === null || query === void 0 ? void 0 : query.helper]);
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
+      onToggle: () => handleToggleHelper(query?.helper),
+      ...props
+    });
+  }, [handleToggleHelper, helperObject, query?.helper]);
   return {
     currentHelper,
     HelperComponent,

package/es/lib/hooks/useKiwtFieldArray.js

@@ -6,11 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _reactFinalFormArrays = require("react-final-form-arrays");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const useKiwtFieldArray = function (name) {
   let submitWholeDeletedObject = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const {
@@ -33,9 +28,10 @@ const useKiwtFieldArray = function (name) {
   const onMarkForDeletion = field => {
     if (field && field.id) {
       if (submitWholeDeletedObject) {
-        fields.push(_objectSpread(_objectSpread({}, field), {}, {
+        fields.push({
+          ...field,
           _delete: true
-        }));
+        });
       } else {
         fields.push({
           id: field.id,
@@ -61,7 +57,10 @@ const useKiwtFieldArray = function (name) {
     }
   };
   const onUpdateField = (index, field) => {
-    fields.update(index, _objectSpread(_objectSpread({}, fields.value[index]), field));
+    fields.update(index, {
+      ...fields.value[index],
+      ...field
+    });
   };
   const items = values.slice(0, endOfList);
   return {

package/es/lib/hooks/useKiwtSASQuery.js

@@ -8,15 +8,7 @@ var _react = require("react");
 var _reactRouterDom = require("react-router-dom");
 var _buildUrl = _interopRequireDefault(require("../utils/buildUrl"));
 var _useQIndex = _interopRequireDefault(require("./useQIndex"));
-const _excluded = ["nsValues"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const locationQuerySetter = _ref => {
   let {
     location,
@@ -32,10 +24,10 @@ const locationQuerySetter = _ref => {
 
   // Do not push to history if the url didn't change
   // https://issues.folio.org/browse/STSMACOM-637
-  if ("".concat(pathname).concat(search) !== url) {
+  if (`${pathname}${search}` !== url) {
     // Only PUSH to history if we're not doing an initialisation OR changing from external-location
     // This is the SASQ state being used here
-    if (['external-location', 'init.reset'].includes(state === null || state === void 0 ? void 0 : state.changeType)) {
+    if (['external-location', 'init.reset'].includes(state?.changeType)) {
       history.replace(url);
     } else {
       history.push(url);
@@ -50,23 +42,27 @@ const useKiwtSASQuery = () => {
   const [qindex] = (0, _useQIndex.default)();
   // Ensure we update the query along with the querySetter
   if (query.qindex !== qindex) {
-    setQuery(_objectSpread(_objectSpread({}, query), {}, {
+    setQuery({
+      ...query,
       qindex
-    }));
+    });
   }
   const querySetter = _ref2 => {
     let {
-        nsValues
-      } = _ref2,
-      rest = _objectWithoutProperties(_ref2, _excluded);
-    setQuery(_objectSpread(_objectSpread(_objectSpread({}, query), nsValues), {}, {
+      nsValues,
+      ...rest
+    } = _ref2;
+    setQuery({
+      ...query,
+      ...nsValues,
       qindex
-    }));
-    locationQuerySetter(_objectSpread(_objectSpread({}, rest), {}, {
+    });
+    locationQuerySetter({
+      ...rest,
       location,
       history,
       nsValues
-    }));
+    });
   };
   return {
     query,

package/es/lib/hooks/useLocalPageStore.js

@@ -6,23 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _zustand = require("zustand");
 var _pagination = require("../constants/pagination");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // Any time that usePrevNextPagination is NOT synced to location,
 // store a keyed currentPage here instead
 const useLocalPageStore = (0, _zustand.create)(set => ({
   pageStore: {},
   setPage: (id, page) => set(state => {
     // Any non-id keyed pages will go into a single storage slot
-    const key = id !== null && id !== void 0 ? id : _pagination.DEFAULT_PAGE_KEY;
-    return _objectSpread(_objectSpread({}, state), {}, {
-      pageStore: _objectSpread(_objectSpread({}, state.pageStore), {}, {
+    const key = id ?? _pagination.DEFAULT_PAGE_KEY;
+    return {
+      ...state,
+      pageStore: {
+        ...state.pageStore,
         [key]: page
-      })
-    });
+      }
+    };
   })
 }));
 var _default = exports.default = useLocalPageStore;

package/es/lib/hooks/useModConfigEntries.js

@@ -22,8 +22,8 @@ const useModConfigEntries = _ref => {
   // eslint-disable-next-line no-console
   console.warn('useModConfigEntries is deprecated, as it utilises mod-config');
   const ky = (0, _core.useOkapiKy)();
-  const query = "?query=(module=".concat(moduleName, " and configName=").concat(configName, ")");
-  const path = "".concat(_endpoints.MOD_SETTINGS_ENDPOINT).concat(query);
+  const query = `?query=(module=${moduleName} and configName=${configName})`;
+  const path = `${_endpoints.MOD_SETTINGS_ENDPOINT}${query}`;
   const namespace = (0, _utils.modConfigEntriesQueryKey)({
     configName,
     moduleName,

package/es/lib/hooks/useMutateCustomProperties/useMutateCustomProperties.js

@@ -5,29 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _useMutateGeneric = _interopRequireDefault(require("../useMutateGeneric"));
-const _excluded = ["endpoint", "id"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const useMutateCustomProperties = _ref => {
   let {
-      endpoint,
-      id
-    } = _ref,
-    mutateGenericProps = _objectWithoutProperties(_ref, _excluded);
-  return (0, _useMutateGeneric.default)(_objectSpread({
+    endpoint,
+    id,
+    ...mutateGenericProps
+  } = _ref;
+  return (0, _useMutateGeneric.default)({
     endpoint,
     endpointMutators: {
-      delete: () => "".concat(endpoint, "/").concat(id),
-      put: () => "".concat(endpoint, "/").concat(id)
+      delete: () => `${endpoint}/${id}`,
+      put: () => `${endpoint}/${id}`
     },
     id,
-    queryKey: ['stripes-kint-components', 'useMutateCustomProperties', id]
-  }, mutateGenericProps));
+    queryKey: ['stripes-kint-components', 'useMutateCustomProperties', id],
+    ...mutateGenericProps
+  });
 };
 var _default = exports.default = useMutateCustomProperties;

package/es/lib/hooks/useMutateGeneric/useMutateGeneric.js

@@ -25,9 +25,9 @@ const useMutateGeneric = function () {
     } = {},
     endpoint,
     endpointMutators: {
-      delete: endpointMutatorDelete = id => "".concat(endpoint, "/").concat(id),
+      delete: endpointMutatorDelete = id => `${endpoint}/${id}`,
       post: endpointMutatorPost = () => endpoint,
-      put: endpointMutatorPut = data => "".concat(endpoint, "/").concat(data.id)
+      put: endpointMutatorPut = data => `${endpoint}/${data.id}`
     } = {},
     payloadMutators: {
       post: payloadMutatorPost = data => ({

package/es/lib/hooks/useMutateModConfigEntry.js

@@ -25,12 +25,12 @@ const useMutateModConfigEntry = _ref => {
     configName,
     moduleName
   });
-  const putQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'putConfigEntry', id], async data => ky.put("".concat(_endpoints.MOD_SETTINGS_ENDPOINT, "/").concat(id), {
+  const putQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'putConfigEntry', id], async data => ky.put(`${_endpoints.MOD_SETTINGS_ENDPOINT}/${id}`, {
     json: data
   }).json().then(() => {
     queryClient.invalidateQueries(baseNamespace);
   }));
-  const postQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'postConfigEntry'], async data => ky.post("".concat(_endpoints.MOD_SETTINGS_ENDPOINT), {
+  const postQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'postConfigEntry'], async data => ky.post(`${_endpoints.MOD_SETTINGS_ENDPOINT}`, {
     json: data
   }).json().then(() => {
     queryClient.invalidateQueries(baseNamespace);

package/es/lib/hooks/useMutateRefdataCategory/useMutateRefdataCategory.js

@@ -7,27 +7,19 @@ exports.default = void 0;
 var _noop = _interopRequireDefault(require("lodash/noop"));
 var _useInvalidateRefdata = _interopRequireDefault(require("../useInvalidateRefdata"));
 var _useMutateGeneric = _interopRequireDefault(require("../useMutateGeneric"));
-const _excluded = ["afterQueryCalls", "endpoint"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const useMutateRefdataCategory = _ref => {
   let {
-      afterQueryCalls: {
-        delete: afterQueryDelete = _noop.default,
-        post: afterQueryPost = _noop.default,
-        put: afterQueryPut = _noop.default
-      } = {},
-      endpoint
-    } = _ref,
-    mutateGenericProps = _objectWithoutProperties(_ref, _excluded);
+    afterQueryCalls: {
+      delete: afterQueryDelete = _noop.default,
+      post: afterQueryPost = _noop.default,
+      put: afterQueryPut = _noop.default
+    } = {},
+    endpoint,
+    ...mutateGenericProps
+  } = _ref;
   const invalidateRefdata = (0, _useInvalidateRefdata.default)();
-  return (0, _useMutateGeneric.default)(_objectSpread({
+  return (0, _useMutateGeneric.default)({
     afterQueryCalls: {
       delete: res => {
         invalidateRefdata().then(() => {
@@ -48,12 +40,14 @@ const useMutateRefdataCategory = _ref => {
     endpoint,
     payloadMutators: {
       post: data => ({
-        json: _objectSpread(_objectSpread({}, data), {}, {
+        json: {
+          ...data,
           values: []
-        })
+        }
       })
     },
-    queryKey: ['stripes-kint-components', 'useMutateRefdataCategory']
-  }, mutateGenericProps));
+    queryKey: ['stripes-kint-components', 'useMutateRefdataCategory'],
+    ...mutateGenericProps
+  });
 };
 var _default = exports.default = useMutateRefdataCategory;