@dgui/react-web 1.0.0 → 1.0.1

package/dist/Components/Drawers/Tabs/Context/Scene.js

@@ -5,7 +5,7 @@ const WebGateway_1 = require("../../../../Generics/WebGateway");
 const react_shared_1 = require("@dgui/react-shared");
 const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
-const Scene = ({ tabId, drawerId }) => {
+const Scene = ({ drawerId, tabId }) => {
     const { tabs } = (0, react_1.useContext)(react_shared_1.TabContext);
     const { swipe = true } = tabs[tabId];
     const gatewayId = (0, react_1.useMemo)(() => {

package/dist/Components/Drawers/Tabs/Context/index.js

@@ -8,34 +8,8 @@ const Scene_1 = __importDefault(require("./Scene"));
 const react_shared_1 = require("@dgui/react-shared");
 const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
-const Context = ({ drawerId, tabIndex: givenTabIndex, onSelectTab }) => {
+const Context = ({ drawerId }) => {
     const { selectTab, tabIndex } = (0, react_1.useContext)(react_shared_1.TabIndexContext);
-    (0, react_1.useEffect)(() => {
-        const safeIndex = Number.isSafeInteger(givenTabIndex) &&
-            Number(givenTabIndex);
-        if (safeIndex) {
-            selectTab((currentIndex) => {
-                if (safeIndex === currentIndex) {
-                    return currentIndex;
-                }
-                else {
-                    return safeIndex;
-                }
-            });
-        }
-    }, [
-        givenTabIndex,
-        selectTab
-    ]);
-    const handleSelectTab = (0, react_1.useCallback)((index) => {
-        selectTab(index);
-        if (onSelectTab) {
-            onSelectTab(index);
-        }
-    }, [
-        onSelectTab,
-        selectTab
-    ]);
     const { tabOrder } = (0, react_1.useContext)(react_shared_1.TabContext);
     const tabs = (0, react_1.useMemo)(() => {
         return tabOrder.map((tab) => {
@@ -45,7 +19,7 @@ const Context = ({ drawerId, tabIndex: givenTabIndex, onSelectTab }) => {
         drawerId,
         tabOrder
     ]);
-    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: handleSelectTab, swipe: false, tabIndex: tabIndex, children: tabs }));
+    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: selectTab, swipe: false, tabIndex: tabIndex, children: tabs }));
 };
 Context.displayName = 'WebDrawersTabsSceneContext';
 exports.default = (0, react_1.memo)(Context);

package/dist/Components/Drawers/Tabs/Scene.js

@@ -11,11 +11,11 @@ const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
 const Scene = ({ drawerId }) => {
     const { drawers } = (0, react_1.useContext)(react_shared_1.DrawerContext);
-    const { swipe = true, tabId } = drawers[drawerId];
+    const { swipe = true, tabs } = drawers[drawerId];
     const gatewayId = (0, react_1.useMemo)(() => {
         return `drawer-${drawerId}`;
     }, []);
-    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseHorse, { swipe: swipe, children: tabId ?
+    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseHorse, { swipe: swipe, children: tabs ?
             ((0, jsx_runtime_1.jsx)(Context_1.default, { drawerId: drawerId })) :
             ((0, jsx_runtime_1.jsx)(WebGateway_1.WebGatewayDest, { gatewayId: gatewayId })) }));
 };

package/dist/Components/Drawers/Tabs/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { type CarouselProps as WebBaseCarouselProps } from '@dgui/react-shared';
-declare const _default: import("react").NamedExoticComponent<WebBaseCarouselProps>;
+declare const _default: import("react").NamedExoticComponent<DrawerProps>;
 export default _default;
-export type DrawerProps = WebBaseCarouselProps;
+export type DrawerProps = {};

package/dist/Components/Drawers/Tabs/index.js

@@ -8,34 +8,8 @@ const Scene_1 = __importDefault(require("./Scene"));
 const react_shared_1 = require("@dgui/react-shared");
 const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
-const Drawers = ({ tabIndex: givenDrawerIndex, onSelectTab: onSelectDrawer }) => {
-    const { selectDrawer, drawerIndex } = (0, react_1.useContext)(react_shared_1.DrawerIndexContext);
-    (0, react_1.useEffect)(() => {
-        const safeIndex = Number.isSafeInteger(givenDrawerIndex) &&
-            Number(givenDrawerIndex);
-        if (safeIndex) {
-            selectDrawer((currentIndex) => {
-                if (safeIndex === currentIndex) {
-                    return currentIndex;
-                }
-                else {
-                    return safeIndex;
-                }
-            });
-        }
-    }, [
-        givenDrawerIndex,
-        selectDrawer
-    ]);
-    const handleSelectTab = (0, react_1.useCallback)((index) => {
-        selectDrawer(index);
-        if (onSelectDrawer) {
-            onSelectDrawer(index);
-        }
-    }, [
-        onSelectDrawer,
-        selectDrawer
-    ]);
+const Drawers = () => {
+    const { drawerIndex, selectDrawer } = (0, react_1.useContext)(react_shared_1.DrawerIndexContext);
     const { drawerOrder } = (0, react_1.useContext)(react_shared_1.DrawerContext);
     const drawers = (0, react_1.useMemo)(() => {
         return drawerOrder.map((drawerId) => {
@@ -44,7 +18,7 @@ const Drawers = ({ tabIndex: givenDrawerIndex, onSelectTab: onSelectDrawer }) =>
     }, [
         drawerOrder
     ]);
-    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: handleSelectTab, tabIndex: drawerIndex, children: drawers }));
+    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: selectDrawer, tabIndex: drawerIndex, children: drawers }));
 };
 Drawers.displayName = 'WebDrawersTabs';
 exports.default = (0, react_1.memo)(Drawers);

package/dist/Components/Drawers/index.d.ts

@@ -1,7 +1,4 @@
 import { type FunctionComponent, type PropsWithChildren } from 'react';
 declare const Drawers: FunctionComponent<DrawersProps>;
 export default Drawers;
-export type DrawersProps = PropsWithChildren<{
-    readonly drawerIndex?: number;
-    readonly onSelectDrawer?: (drawerIndex: number) => void;
-}>;
+export type DrawersProps = PropsWithChildren<{}>;

package/dist/Components/Drawers/index.js

@@ -9,14 +9,11 @@ const WebGateway_1 = require("../../Generics/WebGateway");
 const Tabs_1 = __importDefault(require("./Tabs"));
 const react_shared_1 = require("@dgui/react-shared");
 const react_1 = require("react");
-const Drawers = ({ children, drawerIndex, onSelectDrawer }) => {
+const Drawers = ({ children }) => {
     const { drawerOpen } = (0, react_1.useContext)(react_shared_1.DrawerToggleContext);
     const appBar = (0, react_1.useMemo)(() => {
-        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(WebGateway_1.WebGatewayDest, { gatewayId: 'ReactWebDigestDrawerBar' }), (0, jsx_runtime_1.jsx)(Tabs_1.default, { onSelectTab: onSelectDrawer, tabIndex: drawerIndex })] }));
-    }, [
-        drawerIndex,
-        onSelectDrawer
-    ]);
+        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(WebGateway_1.WebGatewayDest, { gatewayId: 'ReactWebDigestDrawerBar' }), (0, jsx_runtime_1.jsx)(Tabs_1.default, {})] }));
+    }, []);
     return ((0, jsx_runtime_1.jsx)(WebDrawers_1.default, { drawerContent: appBar, open: drawerOpen, children: children }));
 };
 Drawers.displayName = 'WebDrawers';

package/dist/Components/Tabs/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { type CarouselProps as WebBaseCarouselProps } from '@dgui/react-shared';
-declare const _default: import("react").NamedExoticComponent<WebBaseCarouselProps>;
+declare const _default: import("react").NamedExoticComponent<TabProps>;
 export default _default;
-export type TabProps = WebBaseCarouselProps;
+export type TabProps = {};

package/dist/Components/Tabs/index.js

@@ -8,34 +8,8 @@ const Scene_1 = __importDefault(require("./Scene"));
 const react_shared_1 = require("@dgui/react-shared");
 const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
-const Tabs = ({ tabIndex: givenTabIndex, onSelectTab }) => {
+const Tabs = () => {
     const { selectTab, tabIndex } = (0, react_1.useContext)(react_shared_1.TabIndexContext);
-    (0, react_1.useEffect)(() => {
-        const safeIndex = Number.isSafeInteger(givenTabIndex) &&
-            Number(givenTabIndex);
-        if (safeIndex) {
-            selectTab((currentIndex) => {
-                if (safeIndex === currentIndex) {
-                    return currentIndex;
-                }
-                else {
-                    return safeIndex;
-                }
-            });
-        }
-    }, [
-        givenTabIndex,
-        selectTab
-    ]);
-    const handleSelectTab = (0, react_1.useCallback)((index) => {
-        selectTab(index);
-        if (onSelectTab) {
-            onSelectTab(index);
-        }
-    }, [
-        onSelectTab,
-        selectTab
-    ]);
     const { tabOrder } = (0, react_1.useContext)(react_shared_1.TabContext);
     const tabs = (0, react_1.useMemo)(() => {
         const orderedTabs = tabOrder.map((tab) => {
@@ -45,6 +19,6 @@ const Tabs = ({ tabIndex: givenTabIndex, onSelectTab }) => {
     }, [
         tabOrder
     ]);
-    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: handleSelectTab, tabIndex: tabIndex, children: tabs }));
+    return ((0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseCarousel, { onSelectTab: selectTab, tabIndex: tabIndex, children: tabs }));
 };
 exports.default = (0, react_1.memo)(Tabs);

package/dist/Components/WebDrawerBar/DrawerBar/index.js

@@ -23,8 +23,8 @@ const DrawerBar = () => {
             return ((0, jsx_runtime_1.jsx)(WebTabBar_1.WebTabBarTab, { onSelectTab: handleSelectDrawer, tabId: tabId, tabIndex: index }, tabId));
         });
     }, [
-        handleSelectDrawer,
-        drawerOrder
+        drawerOrder,
+        handleSelectDrawer
     ]);
     return ((0, jsx_runtime_1.jsx)("div", { style: styles.drawerBar, children: (0, jsx_runtime_1.jsx)(WebTabBar_1.WebTabBar, { children: tabs }) }));
 };

package/dist/Components/WebTab/index.js

@@ -17,7 +17,7 @@ const react_web_shared_1 = require("@dgui/react-web-shared");
 const react_1 = require("react");
 const WebTab = (_a) => {
     var { children } = _a, props = __rest(_a, ["children"]);
-    const { tabId, gatewayId } = (0, react_1.useMemo)(() => {
+    const { gatewayId, tabId } = (0, react_1.useMemo)(() => {
         return {
             gatewayId: `tab-${props.tabId}`,
             tabId: props.tabId

package/dist/Generics/WebTabBar/WebTabBarTab.js

@@ -11,8 +11,8 @@ const WebTabBarTab = ({ onSelectTab, tabId, tabIndex, tabTitle }) => {
         onSelectTab(tabIndex, tabId);
     }, [
         onSelectTab,
-        tabIndex,
-        tabId
+        tabId,
+        tabIndex
     ]);
     return ((0, jsx_runtime_1.jsx)(WebButton_1.default, { onClick: handlePress, title: tabTitle || tabId }));
 };

package/dist/Providers/index.d.ts

@@ -1,4 +1,5 @@
+import { type ProvidersProps as BaseProvidersProps } from '@dgui/react-shared';
 import { type FunctionComponent, type PropsWithChildren } from 'react';
 declare const Providers: FunctionComponent<ProvidersProps>;
 export default Providers;
-export type ProvidersProps = PropsWithChildren<{}>;
+export type ProvidersProps = BaseProvidersProps & PropsWithChildren<{}>;

package/dist/Providers/index.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_shared_1 = require("@dgui/react-shared");
 const react_web_shared_1 = require("@dgui/react-web-shared");
-const Providers = ({ children }) => {
-    return ((0, jsx_runtime_1.jsx)(react_shared_1.Providers, { children: (0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseGatewayProvider, { children: children }) }));
+const Providers = ({ children, drawerIndex, drawerOpen, onDrawerToggle, onSelectDrawer, onSelectTab, tabIndex }) => {
+    return ((0, jsx_runtime_1.jsx)(react_shared_1.Providers, { drawerIndex: drawerIndex, drawerOpen: drawerOpen, onDrawerToggle: onDrawerToggle, onSelectDrawer: onSelectDrawer, onSelectTab: onSelectTab, tabIndex: tabIndex, children: (0, jsx_runtime_1.jsx)(react_web_shared_1.WebBaseGatewayProvider, { children: children }) }));
 };
 Providers.displayName = 'WebProviders';
 exports.default = Providers;

package/dist/ReactWebDigest.js

@@ -8,7 +8,8 @@ const Drawers_1 = __importDefault(require("./Components/Drawers"));
 const Tabs_1 = __importDefault(require("./Components/Tabs"));
 const WebGateway_1 = require("./Generics/WebGateway");
 const Providers_1 = __importDefault(require("./Providers"));
-const ReactWebDigest = ({ children, drawerIndex, onSelectDrawer, onSelectTab, tabIndex }) => {
-    return ((0, jsx_runtime_1.jsxs)(Providers_1.default, { children: [(0, jsx_runtime_1.jsx)(WebGateway_1.WebGatewayDest, { gatewayId: 'ReactWebDigestAppBar' }), (0, jsx_runtime_1.jsx)(Drawers_1.default, { drawerIndex: drawerIndex, onSelectDrawer: onSelectDrawer, children: (0, jsx_runtime_1.jsx)(Tabs_1.default, { onSelectTab: onSelectTab, tabIndex: tabIndex }) }), children] }));
+const ReactWebDigest = ({ children, drawerIndex, drawerOpen, onDrawerToggle, onSelectDrawer, onSelectTab, tabIndex }) => {
+    return ((0, jsx_runtime_1.jsxs)(Providers_1.default, { drawerIndex: drawerIndex, drawerOpen: drawerOpen, onDrawerToggle: onDrawerToggle, onSelectDrawer: onSelectDrawer, onSelectTab: onSelectTab, tabIndex: tabIndex, children: [(0, jsx_runtime_1.jsx)(WebGateway_1.WebGatewayDest, { gatewayId: 'ReactWebDigestAppBar' }), (0, jsx_runtime_1.jsx)(Drawers_1.default, { children: (0, jsx_runtime_1.jsx)(Tabs_1.default, {}) }), children] }));
 };
+ReactWebDigest.displayName = 'ReactWebDigest';
 exports.default = ReactWebDigest;

package/dist/Types.d.ts

@@ -1,10 +1,6 @@
-import { type ReactWebDigestDrawer, type ReactWebDigestTab } from '.';
-import { type DigestProps, type DrawerType, type TabType } from '@dgui/react-shared';
-import { type PropsWithChildren, type ReactElement } from 'react';
-export type ReactWebDigestProps = DigestProps & {
-    children: Array<ReactElement<typeof ReactWebDigestDrawer>> | Array<ReactElement<typeof ReactWebDigestTab>> | ReactElement<typeof ReactWebDigestDrawer> | ReactElement<typeof ReactWebDigestTab>;
-};
-export type ReactWebDigestAppBarProps = PropsWithChildren<{}>;
-export type ReactWebDigestDrawerProps = DrawerType & PropsWithChildren<{}>;
-export type ReactWebDigestDrawerBarProps = PropsWithChildren<{}>;
-export type ReactWebDigestTabProps = PropsWithChildren<{}> & TabType;
+import { type ReactDigestAppBarProps, type ReactDigestDrawerBarProps, type ReactDigestDrawerProps, type ReactDigestProps, type ReactDigestTabProps } from '@dgui/react-shared';
+export type ReactWebDigestProps = ReactDigestProps;
+export type ReactWebDigestAppBarProps = ReactDigestAppBarProps;
+export type ReactWebDigestDrawerProps = ReactDigestDrawerProps;
+export type ReactWebDigestDrawerBarProps = ReactDigestDrawerBarProps;
+export type ReactWebDigestTabProps = ReactDigestTabProps;

package/dist/index.d.ts

@@ -4,4 +4,4 @@ export { default as ReactWebDigestDrawerBar } from './Components/WebDrawerBar';
 export { default as ReactWebDigestTab } from './Components/WebTab';
 export { default as ReactWebDigest } from './ReactWebDigest';
 export * from './Types';
-export { DrawerContext, type DrawerContextProps, DrawerIndexContext, type DrawerIndexContextProps, DrawerToggleContext, type DrawerToggleContextProps, TabContext, type TabContextProps, TabIndexContext, type TabIndexContextProps } from '@dgui/react-shared';
+export * from '@dgui/react-shared';

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TabIndexContext = exports.TabContext = exports.DrawerToggleContext = exports.DrawerIndexContext = exports.DrawerContext = exports.ReactWebDigest = exports.ReactWebDigestTab = exports.ReactWebDigestDrawerBar = exports.ReactWebDigestDrawer = exports.ReactWebDigestAppBar = void 0;
+exports.ReactWebDigest = exports.ReactWebDigestTab = exports.ReactWebDigestDrawerBar = exports.ReactWebDigestDrawer = exports.ReactWebDigestAppBar = void 0;
 var WebAppBar_1 = require("./Components/WebAppBar");
 Object.defineProperty(exports, "ReactWebDigestAppBar", { enumerable: true, get: function () { return __importDefault(WebAppBar_1).default; } });
 var WebDrawer_1 = require("./Components/WebDrawer");
@@ -29,9 +29,4 @@ Object.defineProperty(exports, "ReactWebDigestTab", { enumerable: true, get: fun
 var ReactWebDigest_1 = require("./ReactWebDigest");
 Object.defineProperty(exports, "ReactWebDigest", { enumerable: true, get: function () { return __importDefault(ReactWebDigest_1).default; } });
 __exportStar(require("./Types"), exports);
-var react_shared_1 = require("@dgui/react-shared");
-Object.defineProperty(exports, "DrawerContext", { enumerable: true, get: function () { return react_shared_1.DrawerContext; } });
-Object.defineProperty(exports, "DrawerIndexContext", { enumerable: true, get: function () { return react_shared_1.DrawerIndexContext; } });
-Object.defineProperty(exports, "DrawerToggleContext", { enumerable: true, get: function () { return react_shared_1.DrawerToggleContext; } });
-Object.defineProperty(exports, "TabContext", { enumerable: true, get: function () { return react_shared_1.TabContext; } });
-Object.defineProperty(exports, "TabIndexContext", { enumerable: true, get: function () { return react_shared_1.TabIndexContext; } });
+__exportStar(require("@dgui/react-shared"), exports);

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@dgui/react-web",
 	"title": "Digested React GUI Web Components",
 	"license": "LGPL-3.0-or-later",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"private": false,
 	"description": "Web Components for a boilerplate React GUI",
 	"author": "wallzero @wallzeroblog (http://wallzero.com)",
@@ -39,40 +39,39 @@
 		"lint:es": "eslint --resolve-plugins-relative-to . 'src/**/*.[jt]s?(x)' --ignore-pattern 'src/**/*.(d.ts|json)'",
 		"clean": "run-s clean:dist clean:node_modules",
 		"clean:node_modules": "rimraf node_modules yarn.lock package-lock.json",
-		"clean:dist": "rimraf dist",
-		"set:version": "npm version --allow-same-version --no-commit-hooks --no-git-tag-version --no-workspaces-update $(npm --silent view $(node -p \"require('./package.json').name\") version)"
+		"clean:dist": "rimraf dist"
 	},
 	"devDependencies": {
-		"@digest/eslint-config-jest": "^4.2.5",
-		"@digest/eslint-config-react": "^4.2.5",
-		"@digest/eslint-config-typescript": "^4.2.5",
-		"@digest/jest-junit": "^4.2.5",
-		"@digest/jest-react": "^4.2.5",
-		"@digest/jest-typescript": "^4.2.5",
-		"@digest/typescript": "^4.2.5",
-		"@types/jest": "^29.5.3",
-		"@types/react": "^18.2.17",
-		"@types/react-dom": "^18.2.7",
-		"@types/react-test-renderer": "^18.0.0",
+		"@digest/eslint-config-jest": "^4.3.0",
+		"@digest/eslint-config-react": "^4.3.0",
+		"@digest/eslint-config-typescript": "^4.3.0",
+		"@digest/jest-junit": "^4.3.0",
+		"@digest/jest-react": "^4.3.0",
+		"@digest/jest-typescript": "^4.3.0",
+		"@digest/typescript": "^4.3.0",
+		"@types/jest": "^29.5.12",
+		"@types/react": "^18.2.55",
+		"@types/react-dom": "^18.2.19",
+		"@types/react-test-renderer": "^18.0.7",
 		"cross-env": "^7.0.3",
-		"jest-environment-jsdom": "^29.6.2",
+		"jest-environment-jsdom": "^29.7.0",
 		"jest-environment-jsdom-global": "^4.0.0",
 		"npm-run-all": "^4.1.5",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"react-modern-drawer": "^1.2.0",
+		"react-modern-drawer": "^1.2.2",
 		"react-test-renderer": "^18.2.0",
-		"rimraf": "^5.0.1"
+		"rimraf": "^5.0.5"
 	},
 	"dependencies": {
-		"@dgui/react-shared": "^1.0.0",
-		"@dgui/react-web-shared": "^1.0.0"
+		"@dgui/react-shared": "^0.8.0",
+		"@dgui/react-web-shared": "^0.8.0"
 	},
 	"peerDependencies": {
 		"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
 		"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0",
 		"react-modern-drawer": "^1.0.0",
-		"swiper": "^8.0.0 || ^9.0.0"
+		"swiper": "^11.0.0"
 	},
 	"keywords": [
 		"digest",
@@ -82,5 +81,5 @@
 		"react-dom",
 		"typescript"
 	],
-	"gitHead": "ac0d0964d66c9c11f50b625d5ca5aec4e20bb72a"
+	"gitHead": "a9678d8273d410633713c0d92dd79629597b40fb"
 }