@panneau/core 1.0.0-alpha.21 → 1.0.0-alpha.224

package/es/contexts.js

@@ -10,13 +10,13 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import isObject from 'lodash/isObject';
 import { getJSON } from '@folklore/fetch';
 import { loadGoogleApi, loadGoogleMaps } from '@folklore/services';
+import { useIntl } from 'react-intl';
 import { getDisplayName } from '@panneau/core/utils';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { generatePath, useHistory } from 'react-router';
 import { TrackingContext, TrackingContainer } from '@folklore/tracking';
 export { TrackingContext } from '@folklore/tracking';
 import { v1 } from 'uuid';
-import { useIntl } from 'react-intl';
 
 var MODALS_NAMESPACE = 'modals';
 var FIELDS_NAMESPACE = 'fields';
@@ -233,6 +233,14 @@ var toggle = PropTypes.shape({
   label: PropTypes.string
 });
 PropTypes.arrayOf(toggle);
+var tableColumn = PropTypes.shape({
+  id: PropTypes.string,
+  component: PropTypes.string,
+  path: PropTypes.string,
+  field: PropTypes.string,
+  columnClassName: PropTypes.string
+});
+PropTypes.arrayOf(tableColumn);
 /**
  * Panneau Definitions
  */
@@ -244,6 +252,7 @@ var routes = PropTypes.shape({
   'resources.show': PropTypes.string.isRequired,
   'resources.edit': PropTypes.string.isRequired,
   'resources.update': PropTypes.string.isRequired,
+  'resources.delete': PropTypes.string.isRequired,
   'resources.destroy': PropTypes.string.isRequired
 });
 var intl = PropTypes.shape({
@@ -258,8 +267,9 @@ var pages = PropTypes.objectOf(page);
 var field = PropTypes.shape({
   // type: PropTypes.string.isRequired,
   name: PropTypes.isRequired,
-  component: PropTypes.string.isRequired,
-  label: PropTypes.isRequired
+  type: PropTypes.string,
+  component: PropTypes.string,
+  label: PropTypes.node
 });
 var fields = PropTypes.arrayOf(field);
 var form = PropTypes.shape({
@@ -270,11 +280,10 @@ var form = PropTypes.shape({
 PropTypes.arrayOf(form);
 var resource = PropTypes.shape({
   id: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
   intl: intl,
   fields: fields,
   forms: PropTypes.shape({}),
-  has_routes: PropTypes.bool,
   shows_in_navbar: PropTypes.bool
 });
 var resources = PropTypes.arrayOf(resource);
@@ -311,6 +320,11 @@ var formError = PropTypes.shape({
   message: PropTypes.string
 });
 PropTypes.arrayOf(formError);
+PropTypes.shape({
+  tus: PropTypes.object
+}); // eslint-disable-line
+
+PropTypes.string;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React.createContext(null);
@@ -343,11 +357,11 @@ var FieldsContext = /*#__PURE__*/React.createContext(null);
 var useFieldsManager = function useFieldsManager() {
   return useContext(FieldsContext);
 };
-var useFieldDefinition = function useFieldDefinition(id) {
+var useField = function useField(id) {
   var manager = useFieldsManager();
   return manager.getDefinition(id);
 };
-var useFieldDefinitions = function useFieldDefinitions() {
+var useFields = function useFields() {
   var manager = useFieldsManager();
   return manager.getDefinitions();
 };
@@ -709,41 +723,43 @@ GoogleMapsClientProvider.propTypes = propTypes$8;
 GoogleMapsClientProvider.defaultProps = defaultProps$8;
 
 /* eslint-disable react/jsx-props-no-spreading */
-var LocalesContext = /*#__PURE__*/React.createContext(null);
-var useLocalesContext = function useLocalesContext() {
-  return useContext(LocalesContext);
-};
-var useLocale = function useLocale() {
-  var _useLocalesContext = useLocalesContext(),
-      _useLocalesContext$lo = _useLocalesContext.locale,
-      locale = _useLocalesContext$lo === void 0 ? null : _useLocalesContext$lo;
-
-  return locale;
-};
+var defaultLocales = ['en', 'fr'];
+var LocalesContext = /*#__PURE__*/React.createContext({
+  locales: defaultLocales
+});
 var useLocales = function useLocales() {
-  var _useLocalesContext2 = useLocalesContext(),
-      _useLocalesContext2$l = _useLocalesContext2.locales,
-      locales = _useLocalesContext2$l === void 0 ? [] : _useLocalesContext2$l;
+  var _useContext = useContext(LocalesContext),
+      locales = _useContext.locales;
 
   return locales;
 };
+var useOtherLocales = function useOtherLocales() {
+  var _useLocales = useLocales(),
+      locales = _useLocales.locales;
+
+  var _useIntl = useIntl(),
+      locale = _useIntl.locale;
+
+  var otherLocales = useMemo(function () {
+    return locales.filter(function (it) {
+      return it !== locale;
+    });
+  }, [locales, locale]);
+  return otherLocales;
+};
 var propTypes$7 = {
   locales: PropTypes.arrayOf(PropTypes.string),
-  locale: PropTypes.string,
   children: PropTypes.node.isRequired
 };
 var defaultProps$7 = {
-  locales: [],
-  locale: 'fr'
+  locales: []
 };
 var LocalesProvider = function LocalesProvider(_ref) {
   var locales = _ref.locales,
-      locale = _ref.locale,
       children = _ref.children;
   return /*#__PURE__*/React.createElement(LocalesContext.Provider, {
     value: {
-      locales: locales,
-      locale: locale
+      locales: locales
     }
   }, children);
 };
@@ -926,6 +942,7 @@ var PanelsProvider = function PanelsProvider(_ref2) {
 PanelsProvider.propTypes = propTypes$5;
 PanelsProvider.defaultProps = defaultProps$5;
 
+var _excluded$3 = ["component"];
 var PanneauContext = /*#__PURE__*/React.createContext(null);
 var usePanneau = function usePanneau() {
   return useContext(PanneauContext);
@@ -982,7 +999,7 @@ var usePanneauComponent = function usePanneauComponent(namespace, name) {
   if (isObject(component) && isString(component === null || component === void 0 ? void 0 : component.componnent)) {
     // eslint-disable-next-line no-unused-vars
     component.component;
-        _objectWithoutProperties(component, ["component"]);
+        _objectWithoutProperties(component, _excluded$3);
 
     return component.component;
   }
@@ -1241,76 +1258,13 @@ var useUppyLocale = function useUppyLocale(locale) {
   return loadedPackage;
 };
 
+var _excluded$2 = ["default"];
 /**
  * Locale loader
  */
 
 var packagesCache$1 = {};
 var defaultPackagesMap$1 = {
-  transloadit: function transloadit() {
-    return import('@uppy/transloadit');
-  },
-  tus: function tus() {
-    return import('@uppy/tus');
-  },
-  xhr: function xhr() {
-    return import('@uppy/xhr-upload');
-  }
-};
-
-var useUppyTransport = function useUppyTransport(transport) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$packagesMap = _ref.packagesMap,
-      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap$1 : _ref$packagesMap;
-
-  // transport
-  var _useState = useState({
-    "package": packagesCache$1[transport] || null
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      loadedPackage = _useState2[0]["package"],
-      setLoadedPackage = _useState2[1];
-
-  var packageLoader = packagesMap[transport] || null;
-  useEffect(function () {
-    var canceled = false;
-
-    if (loadedPackage !== null || packageLoader === null) {
-      return function () {
-        canceled = true;
-      };
-    }
-
-    packageLoader().then(function (_ref2) {
-      var pack = _ref2["default"],
-          others = _objectWithoutProperties(_ref2, ["default"]);
-
-      var dep = Object.keys(others).reduce(function (map, key) {
-        map[key] = others[key]; // eslint-disable-line no-param-reassign
-
-        return map;
-      }, pack);
-      packagesCache$1[transport] = dep;
-
-      if (!canceled) {
-        setLoadedPackage({
-          "package": dep
-        });
-      }
-    });
-    return function () {
-      canceled = true;
-    };
-  }, [packageLoader, loadedPackage, setLoadedPackage]);
-  return loadedPackage;
-};
-
-/**
- * Locale loader
- */
-
-var packagesCache = {};
-var defaultPackagesMap = {
   webcam: function webcam() {
     return import('@uppy/webcam');
   },
@@ -1331,12 +1285,12 @@ var defaultPackagesMap = {
 var useUppySources = function useUppySources(sources) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       _ref$packagesMap = _ref.packagesMap,
-      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap : _ref$packagesMap;
+      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap$1 : _ref$packagesMap;
 
   // transport
   var _useState = useState({
     packages: sources.reduce(function (map, source) {
-      var sourcePackage = packagesCache[source] || null;
+      var sourcePackage = packagesCache$1[source] || null;
 
       if (sourcePackage === null) {
         return map;
@@ -1378,7 +1332,7 @@ var useUppySources = function useUppySources(sources) {
       var newLoadedPackages = sourcesToLoad.reduce(function (map, source, index) {
         var _packagesLoaded$index = packagesLoaded[index],
             pack = _packagesLoaded$index["default"],
-            others = _objectWithoutProperties(_packagesLoaded$index, ["default"]);
+            others = _objectWithoutProperties(_packagesLoaded$index, _excluded$2);
 
         return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, source, Object.keys(others).reduce(function (otherMap, key) {
           otherMap[key] = others[key]; // eslint-disable-line no-param-reassign
@@ -1386,7 +1340,7 @@ var useUppySources = function useUppySources(sources) {
           return otherMap;
         }, pack)));
       }, {});
-      packagesCache = _objectSpread(_objectSpread({}, packagesCache), newLoadedPackages);
+      packagesCache$1 = _objectSpread(_objectSpread({}, packagesCache$1), newLoadedPackages);
 
       if (!canceled) {
         setLoadedPackages({
@@ -1401,6 +1355,71 @@ var useUppySources = function useUppySources(sources) {
   return sourcesToLoad.length === 0 ? loadedPackages : null;
 };
 
+var _excluded$1 = ["default"];
+/**
+ * Locale loader
+ */
+
+var packagesCache = {};
+var defaultPackagesMap = {
+  transloadit: function transloadit() {
+    return import('@uppy/transloadit');
+  },
+  tus: function tus() {
+    return import('@uppy/tus');
+  },
+  xhr: function xhr() {
+    return import('@uppy/xhr-upload');
+  }
+};
+
+var useUppyTransport = function useUppyTransport(transport) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+      _ref$packagesMap = _ref.packagesMap,
+      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap : _ref$packagesMap;
+
+  // transport
+  var _useState = useState({
+    "package": packagesCache[transport] || null
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      loadedPackage = _useState2[0]["package"],
+      setLoadedPackage = _useState2[1];
+
+  var packageLoader = packagesMap[transport] || null;
+  useEffect(function () {
+    var canceled = false;
+
+    if (loadedPackage !== null || packageLoader === null) {
+      return function () {
+        canceled = true;
+      };
+    }
+
+    packageLoader().then(function (_ref2) {
+      var pack = _ref2["default"],
+          others = _objectWithoutProperties(_ref2, _excluded$1);
+
+      var dep = Object.keys(others).reduce(function (map, key) {
+        map[key] = others[key]; // eslint-disable-line no-param-reassign
+
+        return map;
+      }, pack);
+      packagesCache[transport] = dep;
+
+      if (!canceled) {
+        setLoadedPackage({
+          "package": dep
+        });
+      }
+    });
+    return function () {
+      canceled = true;
+    };
+  }, [packageLoader, loadedPackage, setLoadedPackage]);
+  return loadedPackage;
+};
+
 var convertToMedia = function convertToMedia(it) {
   // console.log('upload', it);
   var type = it.data.type.split('/')[0];
@@ -1444,6 +1463,8 @@ var getTransloaditMediasFromResponse = function getTransloaditMediasFromResponse
   });
 };
 
+var _excluded = ["sources"],
+    _excluded2 = ["key", "templateId", "waitForEncoding"];
 var UppyContext = /*#__PURE__*/React.createContext(null);
 var useUppy = function useUppy() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -1459,12 +1480,16 @@ var useUppy = function useUppy() {
   } : _ref$getFileName,
       _ref$meta = _ref.meta,
       meta = _ref$meta === void 0 ? null : _ref$meta,
+      _ref$allowMultipleUpl = _ref.allowMultipleUploads,
+      allowMultipleUploads = _ref$allowMultipleUpl === void 0 ? false : _ref$allowMultipleUpl,
       _ref$maxNumberOfFiles = _ref.maxNumberOfFiles,
-      maxNumberOfFiles = _ref$maxNumberOfFiles === void 0 ? 30 : _ref$maxNumberOfFiles,
+      maxNumberOfFiles = _ref$maxNumberOfFiles === void 0 ? 1 : _ref$maxNumberOfFiles,
       _ref$allowedFileTypes = _ref.allowedFileTypes,
       allowedFileTypes = _ref$allowedFileTypes === void 0 ? null : _ref$allowedFileTypes,
       _ref$autoProceed = _ref.autoProceed,
-      autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed;
+      autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed,
+      _ref$debug = _ref.debug,
+      debug = _ref$debug === void 0 ? false : _ref$debug;
 
   var _ref3 = useContext(UppyContext) || null,
       buildUppy = _ref3.buildUppy,
@@ -1473,13 +1498,15 @@ var useUppy = function useUppy() {
   var uppy = useMemo(function () {
     return buildUppy !== null ? buildUppy({
       meta: meta,
+      allowMultipleUploads: allowMultipleUploads,
       restrictions: {
         maxNumberOfFiles: maxNumberOfFiles,
         allowedFileTypes: allowedFileTypes
       },
-      autoProceed: autoProceed
+      autoProceed: autoProceed,
+      debug: debug
     }) : null;
-  }, [buildUppy, meta, maxNumberOfFiles, allowedFileTypes, autoProceed]);
+  }, [buildUppy, meta, allowMultipleUploads, debug, maxNumberOfFiles, allowedFileTypes, autoProceed]);
   useEffect(function () {
     if (uppy === null) {
       return function () {};
@@ -1621,7 +1648,7 @@ var UppyProvider = function UppyProvider(_ref5) {
       var _ref7 = opts || {},
           _ref7$sources = _ref7.sources,
           customSources = _ref7$sources === void 0 ? sources : _ref7$sources,
-          uppyOpts = _objectWithoutProperties(_ref7, ["sources"]);
+          uppyOpts = _objectWithoutProperties(_ref7, _excluded);
 
       var newUppy = new Uppy(_objectSpread({
         locale: uppyLocale
@@ -1632,7 +1659,7 @@ var UppyProvider = function UppyProvider(_ref5) {
             templateId = transloadit.templateId,
             _transloadit$waitForE = transloadit.waitForEncoding,
             waitForEncoding = _transloadit$waitForE === void 0 ? true : _transloadit$waitForE,
-            transloaditOpts = _objectWithoutProperties(transloadit, ["key", "templateId", "waitForEncoding"]);
+            transloaditOpts = _objectWithoutProperties(transloadit, _excluded2);
 
         newUppy.use(uppyTransport, {
           params: _objectSpread({
@@ -1701,4 +1728,4 @@ var UppyProvider = function UppyProvider(_ref5) {
 UppyProvider.propTypes = propTypes;
 UppyProvider.defaultProps = defaultProps;
 
-export { APP_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesProvider, MODALS_NAMESPACE, ModalsContext, ModalsProvider, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, RoutesContext, RoutesProvider, TrackingProvider, UppyContext, UppyProvider, useAppComponent, useAppComponents, useAppComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useFieldComponent, useFieldDefinition, useFieldDefinitions, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocale, useLocales, useLocalesContext, useModalComponent, useModals, useModalsComponents, useModalsComponentsManager, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withModals, withPanels };
+export { APP_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesContext, LocalesProvider, MODALS_NAMESPACE, ModalsContext, ModalsProvider, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, RoutesContext, RoutesProvider, TrackingProvider, UppyContext, UppyProvider, useAppComponent, useAppComponents, useAppComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useField, useFieldComponent, useFields, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocales, useModalComponent, useModals, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withModals, withPanels };

package/es/hooks.js

@@ -11,7 +11,9 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { getCsrfToken, postJSON, getCSRFHeaders } from '@folklore/fetch';
 import isObject from 'lodash/isObject';
-import { useFieldsManager, usePanneauResources, useUrlGenerator } from '@panneau/core/contexts';
+import isArray from 'lodash/isArray';
+import get from 'lodash/get';
+import { useFieldsManager, usePanneauResources, useResource, useUrlGenerator } from '@panneau/core/contexts';
 import { match } from 'css-mediaquery';
 
 var useAnimationFrame = function useAnimationFrame(onFrame) {
@@ -108,12 +110,15 @@ var useFormattedTime = function useFormattedTime() {
 var eventsManager$1 = typeof document !== 'undefined' ? new EventsManager(document) : null;
 var useDocumentEvent = createUseEvent(eventsManager$1);
 
+var _excluded$1 = ["value", "errors", "onChange"];
+
 var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
   var value = _ref.value,
       errors = _ref.errors,
       _onChange = _ref.onChange,
-      props = _objectWithoutProperties(_ref, ["value", "errors", "onChange"]);
+      props = _objectWithoutProperties(_ref, _excluded$1);
 
+  var locales = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   return fields.reduce(function (allFields, field) {
     var _ref2 = isObject(field) ? field : {},
         _ref2$name = _ref2.name,
@@ -121,12 +126,18 @@ var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
         _ref2$component = _ref2.component,
         component = _ref2$component === void 0 ? null : _ref2$component;
 
-    console.log('f', field);
+    var fieldErrors = errors !== null ? errors[name] || [] : [];
+    var localizedErrors = component === 'localized' ? (locales || []).reduce(function (previousErrors, locale) {
+      var items = errors !== null ? get(errors, "".concat(name, ".").concat(locale), []) || [] : [];
+      var finalItems = isArray(items) ? items : [items];
+      var finalPrevious = isArray(previousErrors) ? previousErrors : [];
+      return [].concat(_toConsumableArray(finalPrevious), _toConsumableArray(finalItems));
+    }, fieldErrors) : fieldErrors;
     return [].concat(_toConsumableArray(allFields), [_objectSpread(_objectSpread({}, isObject(field) ? field : null), {}, {
       name: name,
       component: component,
       value: value !== null ? value[name] || null : null,
-      errors: errors !== null ? errors[name] || null : null,
+      errors: localizedErrors.length > 0 ? localizedErrors : null,
       onChange: function onChange(fieldValue) {
         return _onChange(name, fieldValue);
       }
@@ -161,7 +172,9 @@ var useForm = function useForm() {
       _opts$setValue = opts.setValue,
       setProvidedValue = _opts$setValue === void 0 ? null : _opts$setValue,
       _opts$onComplete = opts.onComplete,
-      onComplete = _opts$onComplete === void 0 ? null : _opts$onComplete;
+      onComplete = _opts$onComplete === void 0 ? null : _opts$onComplete,
+      _opts$locales = opts.locales,
+      locales = _opts$locales === void 0 ? [] : _opts$locales;
 
   var _useState = useState(initialValue || providedValue),
       _useState2 = _slicedToArray(_useState, 2),
@@ -201,7 +214,7 @@ var useForm = function useForm() {
   var hasProvidedGeneralError = setProvidedGeneralError !== null;
   var generalError = hasProvidedGeneralError ? providedGeneralError : stateGeneralError;
   var setGeneralError = hasProvidedGeneralError ? setProvidedGeneralError : setStateGeneralError;
-  var fieldsKey = [value, errors].concat(fields);
+  var fieldsKey = [value, errors, locales].concat(fields);
   var onFieldChange = useCallback(function (fieldName, fieldValue) {
     var fieldErrors = errors !== null ? errors[fieldName] || null : null;
 
@@ -216,7 +229,7 @@ var useForm = function useForm() {
       value: value,
       errors: errors,
       onChange: onFieldChange
-    });
+    }, locales);
   }, fieldsKey);
   var csrfToken = useMemo(function () {
     return getCsrfToken();
@@ -951,24 +964,32 @@ var getResource = function getResource(resources, resourceId) {
 var useResourceUrlGenerator = function useResourceUrlGenerator() {
   var resourceId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var resources = usePanneauResources();
-  var resource = getResource(resources, resourceId);
+  var contextResource = useResource();
+  var resource = getResource(resources, resourceId) || contextResource;
   var route = useUrlGenerator();
   return function (routeResourceId) {
     var routeName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     var finalRouteName = resourceId !== null ? routeResourceId : routeName;
     var finalParams = resourceId !== null ? routeName : params;
-    var finalResource = resource || getResource(resources, routeResourceId);
-    var id = finalResource.id,
-        _finalResource$has_ro = finalResource.has_routes,
-        hasRoutes = _finalResource$has_ro === void 0 ? false : _finalResource$has_ro;
-    var routePrefix = hasRoutes ? "resources.".concat(id) : 'resources';
-    return route("".concat(routePrefix, ".").concat(finalRouteName), _objectSpread(_objectSpread({}, finalParams), {}, {
+    var finalResource = getResource(resources, routeResourceId) || resource;
+
+    var _ref = finalResource || {},
+        _ref$id = _ref.id,
+        id = _ref$id === void 0 ? null : _ref$id; // console.log('gen', finalRouteName, route(`resources.${finalRouteName}`, {
+    //     ...finalParams,
+    //     resource: id,
+    // }));
+
+
+    return id !== null ? route("resources.".concat(finalRouteName), _objectSpread(_objectSpread({}, finalParams), {}, {
       resource: id
-    }));
+    })) : null;
   };
 };
 
+var _excluded = ["width", "height"];
+
 var useScreenSize = function useScreenSize(_ref) {
   var _ref$width = _ref.width,
       width = _ref$width === void 0 ? null : _ref$width,
@@ -1016,7 +1037,7 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
       width = _ref4$width === void 0 ? null : _ref4$width,
       _ref4$height = _ref4.height,
       height = _ref4$height === void 0 ? null : _ref4$height,
-      opts = _objectWithoutProperties(_ref4, ["width", "height"]);
+      opts = _objectWithoutProperties(_ref4, _excluded);
 
   var _useResizeObserver = useResizeObserver(),
       ref = _useResizeObserver.ref,