@ossy/connected-components 0.7.5 → 0.7.7

package/build/index.js

@@ -1,10 +1,30 @@
-import React$1, { useState, useMemo, useCallback, useEffect, useContext, createContext } from 'react';
+import React$1, { createContext, useState, useMemo, useCallback, useEffect } from 'react';
 import { SDK } from '@ossy/sdk';
 import { useResource, WorkspaceProvider, AsyncStatus, useQuery, useResources } from '@ossy/sdk-react';
 import { Overlay, View, Button, Text, useTheme, Theme, useDocumentTitle, Switch } from '@ossy/design-system';
 import { Router } from '@ossy/router-react';
 import { Resume as Resume$1 } from '@ossy/design-system-extras';
 
+function defaultAppSettings() {
+  return {
+    workspaceId: undefined,
+    defaultLanguage: undefined,
+    supportedLanguages: [],
+    theme: undefined,
+    themes: undefined,
+    routes: [],
+    initialEntries: [],
+    initialIndex: 0,
+    router: 'browser',
+    gaId: undefined,
+    apiUrl: undefined,
+    devMode: false
+  };
+}
+
+const AppContext = /*#__PURE__*/createContext(defaultAppSettings());
+const useApp = () => React$1.useContext(AppContext);
+
 const overlayStyles = {
   background: 'transparent',
   display: 'content',
@@ -59,6 +79,7 @@ const ThemeSwitcher = () => {
   }, themeName))));
 };
 const ThemeEditor = () => {
+  const app = useApp();
   const {
     updateResourceContent
   } = useResource('PCX53TaGviq4_8KvK-VOp');
@@ -86,7 +107,7 @@ const ThemeEditor = () => {
   useEffect(() => {
     if (!isEditorOpen) return;
     const views = document.querySelectorAll('[data-view]');
-    views.forEach(view => view.style.border = '1px solid red');
+    // views.forEach(view => view.style.border = '1px solid red')
     setViewCount(views.length);
   }, [isEditorOpen]);
   return /*#__PURE__*/React$1.createElement(Overlay, {
@@ -125,7 +146,7 @@ const ThemeEditor = () => {
   }))), /*#__PURE__*/React$1.createElement(Button, {
     type: "submit",
     variant: "cta"
-  }, "Save")), /*#__PURE__*/React$1.createElement(ThemeSwitcher, null), /*#__PURE__*/React$1.createElement(Text, null, "Views: ", viewCount))), /*#__PURE__*/React$1.createElement(Button, {
+  }, "Save")), /*#__PURE__*/React$1.createElement(ThemeSwitcher, null), /*#__PURE__*/React$1.createElement(Text, null, "Views: ", viewCount)), /*#__PURE__*/React$1.createElement(View, null, /*#__PURE__*/React$1.createElement(View, null, "Pages: ", app?.pages?.length || 0), /*#__PURE__*/React$1.createElement(View, null, (app?.pages || []).map(page => /*#__PURE__*/React$1.createElement(Button, null, page.id))))), /*#__PURE__*/React$1.createElement(Button, {
     variant: "cta",
     prefix: "math-plus",
     style: toggleStyles,
@@ -133,26 +154,6 @@ const ThemeEditor = () => {
   }));
 };
 
-const useAppSettings = () => useContext(AppContext);
-function defaultAppSettings() {
-  return {
-    workspaceId: undefined,
-    defaultLanguage: undefined,
-    supportedLanguages: [],
-    theme: undefined,
-    themes: undefined,
-    routes: [],
-    initialEntries: [],
-    initialIndex: 0,
-    router: 'browser',
-    gaId: undefined,
-    apiUrl: undefined,
-    devMode: false
-  };
-}
-
-const AppContext = /*#__PURE__*/createContext(defaultAppSettings());
-const useApp = () => React$1.useContext(AppContext);
 const App = _appSettings => {
   const appSettings = {
     ...defaultAppSettings(),
@@ -263,45 +264,6 @@ const Ossybot = ({
   })));
 };
 
-const appendSlash = string => string[string.length - 1] === '/' ? string : `${string}/`;
-const prependSlash = string => string[0] === '/' ? string : `/${string}`;
-const padWithSlash = string => appendSlash(prependSlash(string));
-const Predicates = {
-  byLength: desiredLength => route => {
-    const routeParts = route.split('/').filter(x => !!x);
-    return routeParts.length === desiredLength;
-  },
-  byParamPlaceHolders: activePathname => route => {
-    const routeParts = route.split('/').filter(x => !!x).reduce((parts, part) => part.startsWith(':') ? [...parts, '.+?'] : [...parts, part], []).join('/');
-    const regex = new RegExp(`^${padWithSlash(routeParts)}$`);
-    const passes = regex.test(activePathname);
-    return passes;
-  }
-};
-const useActivePageLocation = path => {
-  console.log('useActivePageLocation path', path);
-  const {
-    routes: pages
-  } = useAppSettings();
-  if (!path) return;
-
-  // TODO: this needs tests because I don't think it works right
-  const activePathname = path === '' ? '/' : padWithSlash(path);
-  const registeredPageRoutes = pages.map(page => padWithSlash(page.path));
-  const exactRouteMatch = registeredPageRoutes.find(route => route === activePathname);
-  let activePageLocation;
-  if (!!exactRouteMatch) {
-    activePageLocation = exactRouteMatch;
-  } else {
-    const activePathnameParts = activePathname.split('/').filter(x => !!x);
-    const dynamicRouteMatch = registeredPageRoutes.find(route => Predicates.byLength(activePathnameParts.length)(route) && Predicates.byParamPlaceHolders(activePathname)(route));
-    activePageLocation = dynamicRouteMatch;
-  }
-  console.log('useActivePageLocation exactRouteMatch', exactRouteMatch);
-  console.log('useActivePageLocation activePageLocation', activePageLocation);
-  return activePageLocation;
-};
-
 // import { useParams } from '../use-params'
 // import { AppHeader } from './AppHeader'
 // import { AppFooter } from './AppFooter'
@@ -387,7 +349,7 @@ const Section = ({
 };
 
 const Page = () => {
-  const activePageLocation = useActivePageLocation();
+  const activePageLocation = '/';
   const {
     resources: folder
   } = useResources(`/pages${activePageLocation}`);
@@ -428,7 +390,7 @@ const PageStatus = {
 const PageDataLoader = ({
   children
 }) => {
-  const activePageLocation = useActivePageLocation();
+  const activePageLocation = '/';
   const {
     status,
     resources: folder
@@ -636,4 +598,4 @@ const ThemeProvider = props => {
   }, props)) : /*#__PURE__*/React$1.createElement(React$1.Fragment, null);
 };
 
-export { App, AppContext, Layout, Ossybot, Page, PageDataLoader, PagesModule, Resume, ResumeTemplates, ThemeEditor, ThemeProvider, defaultAppSettings, location, useActivePageLocation, useApp, useAppSettings, useMergeAsyncStatus, useResume };
+export { App, Layout, Ossybot, Page, PageDataLoader, PagesModule, Resume, ResumeTemplates, ThemeEditor, ThemeProvider, defaultAppSettings, location, useApp, useMergeAsyncStatus, useResume };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/connected-components",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -58,5 +58,5 @@
     "/build",
     "README.md"
   ],
-  "gitHead": "2f6cae02ad55e454cbcdcdac8f873a35679e3ece"
+  "gitHead": "9d1619ca70c0fa64a1b57b34f64ff062cd12c640"
 }