@servicetitan/hash-browser-router 32.5.0 → 32.7.0

package/dist/create-hash-browser-history.d.ts

@@ -0,0 +1,3 @@
+import { BrowserHistoryBuildOptions, History } from 'history';
+export declare function createHashBrowserHistory(options: BrowserHistoryBuildOptions): History;
+//# sourceMappingURL=create-hash-browser-history.d.ts.map

package/dist/create-hash-browser-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-hash-browser-history.d.ts","sourceRoot":"","sources":["../src/create-hash-browser-history.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAE1B,OAAO,EAIV,MAAM,SAAS,CAAC;AAGjB,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAkErF"}

package/dist/create-hash-browser-history.js

@@ -0,0 +1,90 @@
+import { createBrowserHistory } from 'history';
+import { triggerSammyLocationChange } from './trigger-sammy-location-change';
+export function createHashBrowserHistory(options) {
+    const { basename = '', ...props } = options;
+    const parent = createBrowserHistory(props);
+    const history = {
+        createHref: (location)=>'/#' + basename + parent.createHref(location),
+        push: (path, state)=>{
+            if (typeof path === 'string') {
+                if (path.startsWith('/#')) {
+                    parent.push(path, state);
+                } else {
+                    parent.push('/#' + basename + path, state);
+                }
+            } else if (path.hash) {
+                parent.push(path);
+            } else {
+                parent.push(convertHashRouterViewToLocation(path, basename));
+            }
+            triggerSammyLocationChange();
+        },
+        replace: (path, state)=>{
+            if (typeof path === 'string') {
+                if (path.startsWith('/#')) {
+                    parent.replace(path, state);
+                } else {
+                    parent.replace('/#' + basename + path, state);
+                }
+            } else if (path.hash) {
+                parent.replace(path);
+            } else {
+                parent.replace(convertHashRouterViewToLocation(path, basename));
+            }
+            triggerSammyLocationChange();
+        },
+        block: (prompt)=>{
+            if (typeof prompt === 'function') {
+                return parent.block((location, action)=>{
+                    return prompt(convertLocationToHashRouterView(location, basename), action);
+                });
+            }
+            return parent.block(prompt);
+        },
+        listen: (listener)=>{
+            return parent.listen((location, action)=>{
+                listener(convertLocationToHashRouterView(location, basename), action);
+            });
+        },
+        get location () {
+            return convertLocationToHashRouterView(parent.location, basename);
+        },
+        set location (l){
+            parent.location = l;
+        }
+    };
+    return Object.setPrototypeOf(history, parent);
+}
+function convertHashRouterViewToLocation(location, basename) {
+    const { search = '', pathname, ...props } = location;
+    const hash = pathname !== undefined ? basename + pathname + search : undefined;
+    return {
+        ...props,
+        pathname: '/',
+        search: '',
+        hash
+    };
+}
+function convertLocationToHashRouterView(location, basename) {
+    let pathname = location.hash ? stripBasename(location.hash.substring(1), basename) : '/';
+    let search = '';
+    const index = pathname.indexOf('?');
+    if (index >= 0) {
+        search = pathname.substring(index);
+        pathname = pathname.substring(0, index);
+    }
+    return {
+        ...location,
+        pathname,
+        search,
+        hash: ''
+    };
+}
+function hasBasename(path, basename) {
+    return basename && path.toLowerCase().startsWith(basename.toLowerCase()) && '/?#'.indexOf(path.charAt(basename.length)) !== -1;
+}
+function stripBasename(path, basename) {
+    return hasBasename(path, basename) ? path.substring(basename.length) : path;
+}
+
+//# sourceMappingURL=create-hash-browser-history.js.map

package/dist/create-hash-browser-history.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/create-hash-browser-history.ts"],"sourcesContent":["import {\n    BrowserHistoryBuildOptions,\n    createBrowserHistory,\n    History,\n    Location,\n    LocationDescriptorObject,\n    LocationState,\n} from 'history';\nimport { triggerSammyLocationChange } from './trigger-sammy-location-change';\n\nexport function createHashBrowserHistory(options: BrowserHistoryBuildOptions): History {\n    const { basename = '', ...props } = options;\n\n    const parent = createBrowserHistory(props);\n\n    const history: Omit<History, 'length' | 'action' | 'go' | 'goBack' | 'goForward'> = {\n        createHref: location => '/#' + basename + parent.createHref(location),\n\n        push: (path, state?: LocationState) => {\n            if (typeof path === 'string') {\n                if (path.startsWith('/#')) {\n                    parent.push(path, state);\n                } else {\n                    parent.push('/#' + basename + path, state);\n                }\n            } else if (path.hash) {\n                parent.push(path);\n            } else {\n                parent.push(convertHashRouterViewToLocation(path, basename));\n            }\n\n            triggerSammyLocationChange();\n        },\n\n        replace: (path, state?: LocationState) => {\n            if (typeof path === 'string') {\n                if (path.startsWith('/#')) {\n                    parent.replace(path, state);\n                } else {\n                    parent.replace('/#' + basename + path, state);\n                }\n            } else if (path.hash) {\n                parent.replace(path);\n            } else {\n                parent.replace(convertHashRouterViewToLocation(path, basename));\n            }\n\n            triggerSammyLocationChange();\n        },\n\n        block: prompt => {\n            if (typeof prompt === 'function') {\n                return parent.block((location, action) => {\n                    return prompt(convertLocationToHashRouterView(location, basename), action);\n                });\n            }\n\n            return parent.block(prompt);\n        },\n\n        listen: listener => {\n            return parent.listen((location, action) => {\n                listener(convertLocationToHashRouterView(location, basename), action);\n            });\n        },\n\n        get location() {\n            return convertLocationToHashRouterView(parent.location, basename);\n        },\n\n        set location(l) {\n            parent.location = l;\n        },\n    };\n\n    return Object.setPrototypeOf(history, parent);\n}\n\nfunction convertHashRouterViewToLocation(location: LocationDescriptorObject, basename: string) {\n    const { search = '', pathname, ...props } = location;\n    const hash = pathname !== undefined ? basename + pathname + search : undefined;\n    return { ...props, pathname: '/', search: '', hash };\n}\n\nfunction convertLocationToHashRouterView(location: Location, basename: string) {\n    let pathname = location.hash ? stripBasename(location.hash.substring(1), basename) : '/';\n    let search = '';\n\n    const index = pathname.indexOf('?');\n    if (index >= 0) {\n        search = pathname.substring(index);\n        pathname = pathname.substring(0, index);\n    }\n\n    return { ...location, pathname, search, hash: '' };\n}\n\nfunction hasBasename(path: string, basename: string) {\n    return (\n        basename &&\n        path.toLowerCase().startsWith(basename.toLowerCase()) &&\n        '/?#'.indexOf(path.charAt(basename.length)) !== -1\n    );\n}\n\nfunction stripBasename(path: string, basename: string) {\n    return hasBasename(path, basename) ? path.substring(basename.length) : path;\n}\n"],"names":["createBrowserHistory","triggerSammyLocationChange","createHashBrowserHistory","options","basename","props","parent","history","createHref","location","push","path","state","startsWith","hash","convertHashRouterViewToLocation","replace","block","prompt","action","convertLocationToHashRouterView","listen","listener","l","Object","setPrototypeOf","search","pathname","undefined","stripBasename","substring","index","indexOf","hasBasename","toLowerCase","charAt","length"],"mappings":"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"}

package/dist/hash-browser-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-browser-router.d.ts","sourceRoot":"","sources":["../src/hash-browser-router.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAU,EAAE,EAAa,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAU,MAAM,kBAAkB,CAAC;AA8B9D,eAAO,MAAM,iBAAiB,EAAE,EAAE,CAAC,kBAAkB,CAIpD,CAAC"}
+{"version":3,"file":"hash-browser-router.d.ts","sourceRoot":"","sources":["../src/hash-browser-router.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAU,MAAM,kBAAkB,CAAC;AAG9D,eAAO,MAAM,iBAAiB,EAAE,EAAE,CAAC,kBAAkB,CAKnD,CAAC"}

package/dist/hash-browser-router.js

@@ -1,136 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createBrowserHistory } from 'history';
-import { useRef, useEffect } from 'react';
-import { Router } from 'react-router-dom';
-import { useDependencies } from '@servicetitan/react-ioc';
+import { provide } from '@servicetitan/react-ioc';
 import { HistoryManager } from '@servicetitan/web-components';
-import { SingletonProvider } from './singleton-provider';
-function useHistory(options) {
-    const history = useRef(createHashBrowserHistory(options)).current;
-    const [historyManager] = useDependencies(HistoryManager);
-    useEffect(()=>{
-        historyManager.register(history);
-        return ()=>{
-            historyManager.unregister(history);
-        };
-    }, [
-        history,
-        historyManager
-    ]);
-    return history;
-}
-const HashBrowserRouterUnwrapped = (props)=>{
+import { Router } from 'react-router-dom';
+import { useHistory } from './use-history';
+export const HashBrowserRouter = provide({
+    singletons: [
+        {
+            provide: HistoryManager,
+            inherit: true
+        }
+    ]
+})((props)=>{
     const history = useHistory(props);
-    const { children } = props;
     return /*#__PURE__*/ _jsx(Router, {
         history: history,
-        children: children
-    });
-};
-export const HashBrowserRouter = (props)=>/*#__PURE__*/ _jsx(SingletonProvider, {
-        provide: HistoryManager,
-        children: /*#__PURE__*/ _jsx(HashBrowserRouterUnwrapped, {
-            ...props
-        })
-    });
-function createHashBrowserHistory({ basename = '', ...props }) {
-    function convertLocationToHashRouterView(l1) {
-        let search = '';
-        let pathname = l1.hash ? l1.hash.substring(1) : '/';
-        if (basename) {
-            pathname = stripBasename(pathname, basename);
-        }
-        const index = pathname.indexOf('?');
-        if (index !== -1) {
-            search = pathname.substring(index);
-            pathname = pathname.substring(0, index);
-        }
-        return {
-            ...l1,
-            search,
-            pathname,
-            hash: ''
-        };
-    }
-    const parent = createBrowserHistory(props);
-    const history = {
-        createHref: (location)=>'/#' + basename + parent.createHref(location),
-        push: (path, state)=>{
-            if (typeof path === 'string') {
-                if (path.startsWith('/#')) {
-                    parent.push(path, state);
-                } else {
-                    parent.push('/#' + basename + path, state);
-                }
-            } else {
-                if (path.hash) {
-                    parent.push(path);
-                } else {
-                    parent.push({
-                        ...path,
-                        pathname: '/',
-                        hash: path.pathname !== undefined ? basename + path.pathname : undefined
-                    });
-                }
-            }
-            triggerSammyLocationChange();
-        },
-        replace: (path, state)=>{
-            if (typeof path === 'string') {
-                if (path.startsWith('/#')) {
-                    parent.replace(path, state);
-                } else {
-                    parent.replace('/#' + basename + path, state);
-                }
-            } else {
-                if (path.hash) {
-                    parent.replace(path);
-                } else {
-                    parent.replace({
-                        ...path,
-                        pathname: '/',
-                        hash: path.pathname !== undefined ? basename + path.pathname : undefined
-                    });
-                }
-            }
-            triggerSammyLocationChange();
-        },
-        block: (prompt)=>{
-            if (typeof prompt === 'function') {
-                return parent.block((origLocation, action)=>{
-                    return prompt(convertLocationToHashRouterView(origLocation), action);
-                });
-            }
-            return parent.block(prompt);
-        },
-        listen: (listener)=>{
-            return parent.listen((origLocation, action)=>{
-                listener(convertLocationToHashRouterView(origLocation), action);
-            });
-        },
-        get location () {
-            return convertLocationToHashRouterView(parent.location);
-        },
-        set location (l){
-            parent.location = l;
-        }
-    };
-    return Object.setPrototypeOf(history, parent);
-}
-function hasBasename(path, prefix) {
-    return path.toLowerCase().indexOf(prefix.toLowerCase()) === 0 && '/?#'.indexOf(path.charAt(prefix.length)) !== -1;
-}
-function stripBasename(path, prefix) {
-    return hasBasename(path, prefix) ? path.substring(prefix.length) : path;
-}
-function triggerSammyLocationChange() {
-    /*
-     * We have to skip ahead `componentWillUnmount` to avoid «race condition»
-     * e.g. in the SettingsLayout component "window.app.swap" could be fired after
-     * the new Sammy route load and it would hide that page.
-     */ setTimeout(()=>{
-        window.dispatchEvent(new HashChangeEvent('hashchange'));
+        ...props
     });
-}
+});
 
 //# sourceMappingURL=hash-browser-router.js.map

package/dist/hash-browser-router.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/hash-browser-router.tsx"],"sourcesContent":["import {\n    BrowserHistoryBuildOptions,\n    History,\n    Location,\n    LocationState,\n    createBrowserHistory,\n} from 'history';\nimport { useRef, FC, useEffect } from 'react';\nimport { BrowserRouterProps, Router } from 'react-router-dom';\n\nimport { useDependencies } from '@servicetitan/react-ioc';\nimport { HistoryManager } from '@servicetitan/web-components';\n\nimport { SingletonProvider } from './singleton-provider';\n\nfunction useHistory(options: BrowserHistoryBuildOptions) {\n    const history = useRef(createHashBrowserHistory(options)).current;\n\n    const [historyManager] = useDependencies(HistoryManager);\n\n    useEffect(() => {\n        historyManager.register(history);\n\n        return () => {\n            historyManager.unregister(history);\n        };\n    }, [history, historyManager]);\n\n    return history;\n}\n\nconst HashBrowserRouterUnwrapped: FC<BrowserRouterProps> = props => {\n    const history = useHistory(props);\n    const { children } = props;\n\n    return <Router history={history}>{children}</Router>;\n};\n\nexport const HashBrowserRouter: FC<BrowserRouterProps> = props => (\n    <SingletonProvider provide={HistoryManager}>\n        <HashBrowserRouterUnwrapped {...props} />\n    </SingletonProvider>\n);\n\nfunction createHashBrowserHistory({\n    basename = '',\n    ...props\n}: BrowserHistoryBuildOptions): History {\n    function convertLocationToHashRouterView(l: Location): Location {\n        let search = '';\n        let pathname = l.hash ? l.hash.substring(1) : '/';\n        if (basename) {\n            pathname = stripBasename(pathname, basename);\n        }\n        const index = pathname.indexOf('?');\n        if (index !== -1) {\n            search = pathname.substring(index);\n            pathname = pathname.substring(0, index);\n        }\n        return {\n            ...l,\n            search,\n            pathname,\n            hash: '',\n        };\n    }\n\n    const parent = createBrowserHistory(props);\n\n    const history: Omit<History, 'length' | 'action' | 'go' | 'goBack' | 'goForward'> = {\n        createHref: location => '/#' + basename + parent.createHref(location),\n\n        push: (path, state?: LocationState) => {\n            if (typeof path === 'string') {\n                if (path.startsWith('/#')) {\n                    parent.push(path, state);\n                } else {\n                    parent.push('/#' + basename + path, state);\n                }\n            } else {\n                if (path.hash) {\n                    parent.push(path);\n                } else {\n                    parent.push({\n                        ...path,\n                        pathname: '/',\n                        hash: path.pathname !== undefined ? basename + path.pathname : undefined,\n                    });\n                }\n            }\n\n            triggerSammyLocationChange();\n        },\n\n        replace: (path, state?: LocationState) => {\n            if (typeof path === 'string') {\n                if (path.startsWith('/#')) {\n                    parent.replace(path, state);\n                } else {\n                    parent.replace('/#' + basename + path, state);\n                }\n            } else {\n                if (path.hash) {\n                    parent.replace(path);\n                } else {\n                    parent.replace({\n                        ...path,\n                        pathname: '/',\n                        hash: path.pathname !== undefined ? basename + path.pathname : undefined,\n                    });\n                }\n            }\n\n            triggerSammyLocationChange();\n        },\n\n        block: prompt => {\n            if (typeof prompt === 'function') {\n                return parent.block((origLocation, action) => {\n                    return prompt(convertLocationToHashRouterView(origLocation), action);\n                });\n            }\n\n            return parent.block(prompt);\n        },\n\n        listen: listener => {\n            return parent.listen((origLocation, action) => {\n                listener(convertLocationToHashRouterView(origLocation), action);\n            });\n        },\n\n        get location() {\n            return convertLocationToHashRouterView(parent.location);\n        },\n        set location(l) {\n            parent.location = l;\n        },\n    };\n\n    return Object.setPrototypeOf(history, parent);\n}\n\nfunction hasBasename(path: string, prefix: string) {\n    return (\n        path.toLowerCase().indexOf(prefix.toLowerCase()) === 0 &&\n        '/?#'.indexOf(path.charAt(prefix.length)) !== -1\n    );\n}\n\nfunction stripBasename(path: string, prefix: string) {\n    return hasBasename(path, prefix) ? path.substring(prefix.length) : path;\n}\n\nfunction triggerSammyLocationChange() {\n    /*\n     * We have to skip ahead `componentWillUnmount` to avoid «race condition»\n     * e.g. in the SettingsLayout component \"window.app.swap\" could be fired after\n     * the new Sammy route load and it would hide that page.\n     */\n    setTimeout(() => {\n        window.dispatchEvent(new HashChangeEvent('hashchange'));\n    });\n}\n"],"names":["createBrowserHistory","useRef","useEffect","Router","useDependencies","HistoryManager","SingletonProvider","useHistory","options","history","createHashBrowserHistory","current","historyManager","register","unregister","HashBrowserRouterUnwrapped","props","children","HashBrowserRouter","provide","basename","convertLocationToHashRouterView","l","search","pathname","hash","substring","stripBasename","index","indexOf","parent","createHref","location","push","path","state","startsWith","undefined","triggerSammyLocationChange","replace","block","prompt","origLocation","action","listen","listener","Object","setPrototypeOf","hasBasename","prefix","toLowerCase","charAt","length","setTimeout","window","dispatchEvent","HashChangeEvent"],"mappings":";AAAA,SAKIA,oBAAoB,QACjB,UAAU;AACjB,SAASC,MAAM,EAAMC,SAAS,QAAQ,QAAQ;AAC9C,SAA6BC,MAAM,QAAQ,mBAAmB;AAE9D,SAASC,eAAe,QAAQ,0BAA0B;AAC1D,SAASC,cAAc,QAAQ,+BAA+B;AAE9D,SAASC,iBAAiB,QAAQ,uBAAuB;AAEzD,SAASC,WAAWC,OAAmC;IACnD,MAAMC,UAAUR,OAAOS,yBAAyBF,UAAUG,OAAO;IAEjE,MAAM,CAACC,eAAe,GAAGR,gBAAgBC;IAEzCH,UAAU;QACNU,eAAeC,QAAQ,CAACJ;QAExB,OAAO;YACHG,eAAeE,UAAU,CAACL;QAC9B;IACJ,GAAG;QAACA;QAASG;KAAe;IAE5B,OAAOH;AACX;AAEA,MAAMM,6BAAqDC,CAAAA;IACvD,MAAMP,UAAUF,WAAWS;IAC3B,MAAM,EAAEC,QAAQ,EAAE,GAAGD;IAErB,qBAAO,KAACb;QAAOM,SAASA;kBAAUQ;;AACtC;AAEA,OAAO,MAAMC,oBAA4CF,CAAAA,sBACrD,KAACV;QAAkBa,SAASd;kBACxB,cAAA,KAACU;YAA4B,GAAGC,KAAK;;OAE3C;AAEF,SAASN,yBAAyB,EAC9BU,WAAW,EAAE,EACb,GAAGJ,OACsB;IACzB,SAASK,gCAAgCC,EAAW;QAChD,IAAIC,SAAS;QACb,IAAIC,WAAWF,GAAEG,IAAI,GAAGH,GAAEG,IAAI,CAACC,SAAS,CAAC,KAAK;QAC9C,IAAIN,UAAU;YACVI,WAAWG,cAAcH,UAAUJ;QACvC;QACA,MAAMQ,QAAQJ,SAASK,OAAO,CAAC;QAC/B,IAAID,UAAU,CAAC,GAAG;YACdL,SAASC,SAASE,SAAS,CAACE;YAC5BJ,WAAWA,SAASE,SAAS,CAAC,GAAGE;QACrC;QACA,OAAO;YACH,GAAGN,EAAC;YACJC;YACAC;YACAC,MAAM;QACV;IACJ;IAEA,MAAMK,SAAS9B,qBAAqBgB;IAEpC,MAAMP,UAA8E;QAChFsB,YAAYC,CAAAA,WAAY,OAAOZ,WAAWU,OAAOC,UAAU,CAACC;QAE5DC,MAAM,CAACC,MAAMC;YACT,IAAI,OAAOD,SAAS,UAAU;gBAC1B,IAAIA,KAAKE,UAAU,CAAC,OAAO;oBACvBN,OAAOG,IAAI,CAACC,MAAMC;gBACtB,OAAO;oBACHL,OAAOG,IAAI,CAAC,OAAOb,WAAWc,MAAMC;gBACxC;YACJ,OAAO;gBACH,IAAID,KAAKT,IAAI,EAAE;oBACXK,OAAOG,IAAI,CAACC;gBAChB,OAAO;oBACHJ,OAAOG,IAAI,CAAC;wBACR,GAAGC,IAAI;wBACPV,UAAU;wBACVC,MAAMS,KAAKV,QAAQ,KAAKa,YAAYjB,WAAWc,KAAKV,QAAQ,GAAGa;oBACnE;gBACJ;YACJ;YAEAC;QACJ;QAEAC,SAAS,CAACL,MAAMC;YACZ,IAAI,OAAOD,SAAS,UAAU;gBAC1B,IAAIA,KAAKE,UAAU,CAAC,OAAO;oBACvBN,OAAOS,OAAO,CAACL,MAAMC;gBACzB,OAAO;oBACHL,OAAOS,OAAO,CAAC,OAAOnB,WAAWc,MAAMC;gBAC3C;YACJ,OAAO;gBACH,IAAID,KAAKT,IAAI,EAAE;oBACXK,OAAOS,OAAO,CAACL;gBACnB,OAAO;oBACHJ,OAAOS,OAAO,CAAC;wBACX,GAAGL,IAAI;wBACPV,UAAU;wBACVC,MAAMS,KAAKV,QAAQ,KAAKa,YAAYjB,WAAWc,KAAKV,QAAQ,GAAGa;oBACnE;gBACJ;YACJ;YAEAC;QACJ;QAEAE,OAAOC,CAAAA;YACH,IAAI,OAAOA,WAAW,YAAY;gBAC9B,OAAOX,OAAOU,KAAK,CAAC,CAACE,cAAcC;oBAC/B,OAAOF,OAAOpB,gCAAgCqB,eAAeC;gBACjE;YACJ;YAEA,OAAOb,OAAOU,KAAK,CAACC;QACxB;QAEAG,QAAQC,CAAAA;YACJ,OAAOf,OAAOc,MAAM,CAAC,CAACF,cAAcC;gBAChCE,SAASxB,gCAAgCqB,eAAeC;YAC5D;QACJ;QAEA,IAAIX,YAAW;YACX,OAAOX,gCAAgCS,OAAOE,QAAQ;QAC1D;QACA,IAAIA,UAASV,EAAG;YACZQ,OAAOE,QAAQ,GAAGV;QACtB;IACJ;IAEA,OAAOwB,OAAOC,cAAc,CAACtC,SAASqB;AAC1C;AAEA,SAASkB,YAAYd,IAAY,EAAEe,MAAc;IAC7C,OACIf,KAAKgB,WAAW,GAAGrB,OAAO,CAACoB,OAAOC,WAAW,QAAQ,KACrD,MAAMrB,OAAO,CAACK,KAAKiB,MAAM,CAACF,OAAOG,MAAM,OAAO,CAAC;AAEvD;AAEA,SAASzB,cAAcO,IAAY,EAAEe,MAAc;IAC/C,OAAOD,YAAYd,MAAMe,UAAUf,KAAKR,SAAS,CAACuB,OAAOG,MAAM,IAAIlB;AACvE;AAEA,SAASI;IACL;;;;KAIC,GACDe,WAAW;QACPC,OAAOC,aAAa,CAAC,IAAIC,gBAAgB;IAC7C;AACJ"}
+{"version":3,"sources":["../src/hash-browser-router.tsx"],"sourcesContent":["import { provide } from '@servicetitan/react-ioc';\nimport { HistoryManager } from '@servicetitan/web-components';\nimport { FC } from 'react';\nimport { BrowserRouterProps, Router } from 'react-router-dom';\nimport { useHistory } from './use-history';\n\nexport const HashBrowserRouter: FC<BrowserRouterProps> = provide({\n    singletons: [{ provide: HistoryManager, inherit: true }],\n})(props => {\n    const history = useHistory(props);\n    return <Router history={history} {...props} />;\n});\n"],"names":["provide","HistoryManager","Router","useHistory","HashBrowserRouter","singletons","inherit","props","history"],"mappings":";AAAA,SAASA,OAAO,QAAQ,0BAA0B;AAClD,SAASC,cAAc,QAAQ,+BAA+B;AAE9D,SAA6BC,MAAM,QAAQ,mBAAmB;AAC9D,SAASC,UAAU,QAAQ,gBAAgB;AAE3C,OAAO,MAAMC,oBAA4CJ,QAAQ;IAC7DK,YAAY;QAAC;YAAEL,SAASC;YAAgBK,SAAS;QAAK;KAAE;AAC5D,GAAGC,CAAAA;IACC,MAAMC,UAAUL,WAAWI;IAC3B,qBAAO,KAACL;QAAOM,SAASA;QAAU,GAAGD,KAAK;;AAC9C,GAAG"}

package/dist/trigger-sammy-location-change.d.ts

@@ -0,0 +1,2 @@
+export declare function triggerSammyLocationChange(): void;
+//# sourceMappingURL=trigger-sammy-location-change.d.ts.map

package/dist/trigger-sammy-location-change.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trigger-sammy-location-change.d.ts","sourceRoot":"","sources":["../src/trigger-sammy-location-change.ts"],"names":[],"mappings":"AAAA,wBAAgB,0BAA0B,SASzC"}

package/dist/trigger-sammy-location-change.js

@@ -0,0 +1,11 @@
+export function triggerSammyLocationChange() {
+    /*
+     * We have to skip ahead `componentWillUnmount` to avoid «race condition»
+     * e.g. in the SettingsLayout component "window.app.swap" could be fired after
+     * the new Sammy route load and it would hide that page.
+     */ setTimeout(()=>{
+        window.dispatchEvent(new HashChangeEvent('hashchange'));
+    });
+}
+
+//# sourceMappingURL=trigger-sammy-location-change.js.map

package/dist/trigger-sammy-location-change.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/trigger-sammy-location-change.ts"],"sourcesContent":["export function triggerSammyLocationChange() {\n    /*\n     * We have to skip ahead `componentWillUnmount` to avoid «race condition»\n     * e.g. in the SettingsLayout component \"window.app.swap\" could be fired after\n     * the new Sammy route load and it would hide that page.\n     */\n    setTimeout(() => {\n        window.dispatchEvent(new HashChangeEvent('hashchange'));\n    });\n}\n"],"names":["triggerSammyLocationChange","setTimeout","window","dispatchEvent","HashChangeEvent"],"mappings":"AAAA,OAAO,SAASA;IACZ;;;;KAIC,GACDC,WAAW;QACPC,OAAOC,aAAa,CAAC,IAAIC,gBAAgB;IAC7C;AACJ"}

package/dist/use-history.d.ts

@@ -0,0 +1,3 @@
+import { BrowserHistoryBuildOptions } from 'history';
+export declare function useHistory(options: BrowserHistoryBuildOptions): import("history").History<unknown>;
+//# sourceMappingURL=use-history.d.ts.map

package/dist/use-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-history.d.ts","sourceRoot":"","sources":["../src/use-history.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAIrD,wBAAgB,UAAU,CAAC,OAAO,EAAE,0BAA0B,sCAc7D"}

package/dist/use-history.js

@@ -0,0 +1,20 @@
+import { useDependencies } from '@servicetitan/react-ioc';
+import { HistoryManager } from '@servicetitan/web-components';
+import { useEffect, useRef } from 'react';
+import { createHashBrowserHistory } from './create-hash-browser-history';
+export function useHistory(options) {
+    const history = useRef(createHashBrowserHistory(options)).current;
+    const [historyManager] = useDependencies(HistoryManager);
+    useEffect(()=>{
+        historyManager.register(history);
+        return ()=>{
+            historyManager.unregister(history);
+        };
+    }, [
+        history,
+        historyManager
+    ]);
+    return history;
+}
+
+//# sourceMappingURL=use-history.js.map

package/dist/use-history.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/use-history.ts"],"sourcesContent":["import { useDependencies } from '@servicetitan/react-ioc';\nimport { HistoryManager } from '@servicetitan/web-components';\nimport { BrowserHistoryBuildOptions } from 'history';\nimport { useEffect, useRef } from 'react';\nimport { createHashBrowserHistory } from './create-hash-browser-history';\n\nexport function useHistory(options: BrowserHistoryBuildOptions) {\n    const history = useRef(createHashBrowserHistory(options)).current;\n\n    const [historyManager] = useDependencies(HistoryManager);\n\n    useEffect(() => {\n        historyManager.register(history);\n\n        return () => {\n            historyManager.unregister(history);\n        };\n    }, [history, historyManager]);\n\n    return history;\n}\n"],"names":["useDependencies","HistoryManager","useEffect","useRef","createHashBrowserHistory","useHistory","options","history","current","historyManager","register","unregister"],"mappings":"AAAA,SAASA,eAAe,QAAQ,0BAA0B;AAC1D,SAASC,cAAc,QAAQ,+BAA+B;AAE9D,SAASC,SAAS,EAAEC,MAAM,QAAQ,QAAQ;AAC1C,SAASC,wBAAwB,QAAQ,gCAAgC;AAEzE,OAAO,SAASC,WAAWC,OAAmC;IAC1D,MAAMC,UAAUJ,OAAOC,yBAAyBE,UAAUE,OAAO;IAEjE,MAAM,CAACC,eAAe,GAAGT,gBAAgBC;IAEzCC,UAAU;QACNO,eAAeC,QAAQ,CAACH;QAExB,OAAO;YACHE,eAAeE,UAAU,CAACJ;QAC9B;IACJ,GAAG;QAACA;QAASE;KAAe;IAE5B,OAAOF;AACX"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/hash-browser-router",
-    "version": "32.5.0",
+    "version": "32.7.0",
     "description": "",
     "repository": {
         "type": "git",
@@ -15,8 +15,8 @@
         "src"
     ],
     "devDependencies": {
-        "@servicetitan/react-ioc": "32.5.0",
-        "@servicetitan/web-components": "32.5.0",
+        "@servicetitan/react-ioc": "32.7.0",
+        "@servicetitan/web-components": "32.7.0",
         "@testing-library/dom": "^10.4.1",
         "@testing-library/react": "^16.3.0",
         "@types/history": "~4.7.10",
@@ -27,8 +27,8 @@
         "react-router-dom": "~5.3.0"
     },
     "peerDependencies": {
-        "@servicetitan/react-ioc": "32.5.0",
-        "@servicetitan/web-components": "32.5.0",
+        "@servicetitan/react-ioc": "32.7.0",
+        "@servicetitan/web-components": "32.7.0",
         "history": "~4.10.1",
         "react": ">=17.0.2",
         "react-router-dom": "~5.3.0"
@@ -39,5 +39,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "9ba97491f520e7b5914179aa061d1c3c3285079d"
+    "gitHead": "673fb6b56865da309c09f91b4ebf30aaf815a562"
 }

package/src/__tests__/hash-browser-router.test.tsx

@@ -80,19 +80,35 @@ describe(`${HashBrowserRouter.name}`, () => {
         });
     }
 
-    beforeEach(() => (location = '/foo'));
+    beforeEach(() => (location = '/foo?baz=qux')); // testing location with search
+
+    function getPathname(url: string) {
+        return RegExp(/^([^?]+)/).exec(url)![0];
+    }
+
+    function getSearch(url: string) {
+        return RegExp(/(\?.+)$/).exec(url)![0];
+    }
 
     itPushesAndReplacesWith('/#{location}', {
         url: () => `/#${location}`,
-        prompt: () => ({ pathname: location, search: '', hash: '' }),
+        prompt: () => ({
+            pathname: getPathname(location),
+            search: getSearch(location),
+            hash: '',
+        }),
     });
 
     describe('when location starts with "/#"', () => {
-        beforeEach(() => (location = '/#bar'));
+        beforeEach(() => (location = '/#bar?baz=qux'));
 
         itPushesAndReplacesWith('location', {
             url: () => `${location}`,
-            prompt: () => ({ pathname: `${location.replace('/#', '')}`, search: '', hash: '' }),
+            prompt: () => ({
+                pathname: getPathname(location).replace('/#', ''),
+                search: getSearch(location),
+                hash: '',
+            }),
         });
     });
 
@@ -101,18 +117,22 @@ describe(`${HashBrowserRouter.name}`, () => {
 
         itPushesAndReplacesWith('"/#{basename}{location}"', {
             url: () => `/#${props.basename}${location}`,
-            prompt: () => ({ pathname: location, search: '', hash: '' }),
+            prompt: () => ({
+                pathname: getPathname(location),
+                search: getSearch(location),
+                hash: '',
+            }),
         });
     });
 
     describe('with location object', () => {
-        beforeEach(() => (locationObj = { pathname: '/foo?baz=qux' })); // testing pathname with search params
+        beforeEach(() => (locationObj = { pathname: '/foo', search: '?baz=qux' }));
 
-        itPushesAndReplacesWith('"/#{location.pathname}"', {
-            url: () => `/#${locationObj.pathname}`,
+        itPushesAndReplacesWith('"/#{location.pathname}{location.search}"', {
+            url: () => `/#${locationObj.pathname}${locationObj.search}`,
             prompt: () => ({
-                pathname: `${locationObj.pathname!.match(/^([^?]+)/)![0]}`,
-                search: `${locationObj.pathname!.match(/(\?.+)$/)![0]}`,
+                pathname: locationObj.pathname,
+                search: locationObj.search,
                 hash: '',
             }),
         });
@@ -120,8 +140,8 @@ describe(`${HashBrowserRouter.name}`, () => {
         describe('when location includes a hash', () => {
             beforeEach(() => (locationObj.hash = '#bar'));
 
-            itPushesAndReplacesWith('location', {
-                url: () => `${locationObj.pathname}${locationObj.hash}`,
+            itPushesAndReplacesWith('/#{location.pathname}{location.search}{location.hash}', {
+                url: () => `${locationObj.pathname}${locationObj.search}${locationObj.hash}`,
                 prompt: () => ({
                     pathname: `${locationObj.hash!.replace('#', '')}`,
                     search: '',
@@ -133,11 +153,11 @@ describe(`${HashBrowserRouter.name}`, () => {
         describe('with a basename', () => {
             beforeEach(() => (props.basename = '/baz'));
 
-            itPushesAndReplacesWith('"/#{basename}{location.pathname}', {
-                url: () => `/#${props.basename}${locationObj.pathname}`,
+            itPushesAndReplacesWith('"/#{basename}{location.pathname}{location.search}', {
+                url: () => `/#${props.basename}${locationObj.pathname}${locationObj.search}`,
                 prompt: () => ({
-                    pathname: `${locationObj.pathname!.match(/^([^?]+)/)![0]}`,
-                    search: `${locationObj.pathname!.match(/(\?.+)$/)![0]}`,
+                    pathname: locationObj.pathname,
+                    search: locationObj.search,
                     hash: '',
                 }),
             });

package/src/create-hash-browser-history.ts

@@ -0,0 +1,108 @@
+import {
+    BrowserHistoryBuildOptions,
+    createBrowserHistory,
+    History,
+    Location,
+    LocationDescriptorObject,
+    LocationState,
+} from 'history';
+import { triggerSammyLocationChange } from './trigger-sammy-location-change';
+
+export function createHashBrowserHistory(options: BrowserHistoryBuildOptions): History {
+    const { basename = '', ...props } = options;
+
+    const parent = createBrowserHistory(props);
+
+    const history: Omit<History, 'length' | 'action' | 'go' | 'goBack' | 'goForward'> = {
+        createHref: location => '/#' + basename + parent.createHref(location),
+
+        push: (path, state?: LocationState) => {
+            if (typeof path === 'string') {
+                if (path.startsWith('/#')) {
+                    parent.push(path, state);
+                } else {
+                    parent.push('/#' + basename + path, state);
+                }
+            } else if (path.hash) {
+                parent.push(path);
+            } else {
+                parent.push(convertHashRouterViewToLocation(path, basename));
+            }
+
+            triggerSammyLocationChange();
+        },
+
+        replace: (path, state?: LocationState) => {
+            if (typeof path === 'string') {
+                if (path.startsWith('/#')) {
+                    parent.replace(path, state);
+                } else {
+                    parent.replace('/#' + basename + path, state);
+                }
+            } else if (path.hash) {
+                parent.replace(path);
+            } else {
+                parent.replace(convertHashRouterViewToLocation(path, basename));
+            }
+
+            triggerSammyLocationChange();
+        },
+
+        block: prompt => {
+            if (typeof prompt === 'function') {
+                return parent.block((location, action) => {
+                    return prompt(convertLocationToHashRouterView(location, basename), action);
+                });
+            }
+
+            return parent.block(prompt);
+        },
+
+        listen: listener => {
+            return parent.listen((location, action) => {
+                listener(convertLocationToHashRouterView(location, basename), action);
+            });
+        },
+
+        get location() {
+            return convertLocationToHashRouterView(parent.location, basename);
+        },
+
+        set location(l) {
+            parent.location = l;
+        },
+    };
+
+    return Object.setPrototypeOf(history, parent);
+}
+
+function convertHashRouterViewToLocation(location: LocationDescriptorObject, basename: string) {
+    const { search = '', pathname, ...props } = location;
+    const hash = pathname !== undefined ? basename + pathname + search : undefined;
+    return { ...props, pathname: '/', search: '', hash };
+}
+
+function convertLocationToHashRouterView(location: Location, basename: string) {
+    let pathname = location.hash ? stripBasename(location.hash.substring(1), basename) : '/';
+    let search = '';
+
+    const index = pathname.indexOf('?');
+    if (index >= 0) {
+        search = pathname.substring(index);
+        pathname = pathname.substring(0, index);
+    }
+
+    return { ...location, pathname, search, hash: '' };
+}
+
+function hasBasename(path: string, basename: string) {
+    return (
+        basename &&
+        path.toLowerCase().startsWith(basename.toLowerCase()) &&
+        '/?#'.indexOf(path.charAt(basename.length)) !== -1
+    );
+}
+
+function stripBasename(path: string, basename: string) {
+    return hasBasename(path, basename) ? path.substring(basename.length) : path;
+}

package/src/hash-browser-router.tsx

@@ -1,164 +1,12 @@
-import {
-    BrowserHistoryBuildOptions,
-    History,
-    Location,
-    LocationState,
-    createBrowserHistory,
-} from 'history';
-import { useRef, FC, useEffect } from 'react';
-import { BrowserRouterProps, Router } from 'react-router-dom';
-
-import { useDependencies } from '@servicetitan/react-ioc';
+import { provide } from '@servicetitan/react-ioc';
 import { HistoryManager } from '@servicetitan/web-components';
+import { FC } from 'react';
+import { BrowserRouterProps, Router } from 'react-router-dom';
+import { useHistory } from './use-history';
 
-import { SingletonProvider } from './singleton-provider';
-
-function useHistory(options: BrowserHistoryBuildOptions) {
-    const history = useRef(createHashBrowserHistory(options)).current;
-
-    const [historyManager] = useDependencies(HistoryManager);
-
-    useEffect(() => {
-        historyManager.register(history);
-
-        return () => {
-            historyManager.unregister(history);
-        };
-    }, [history, historyManager]);
-
-    return history;
-}
-
-const HashBrowserRouterUnwrapped: FC<BrowserRouterProps> = props => {
+export const HashBrowserRouter: FC<BrowserRouterProps> = provide({
+    singletons: [{ provide: HistoryManager, inherit: true }],
+})(props => {
     const history = useHistory(props);
-    const { children } = props;
-
-    return <Router history={history}>{children}</Router>;
-};
-
-export const HashBrowserRouter: FC<BrowserRouterProps> = props => (
-    <SingletonProvider provide={HistoryManager}>
-        <HashBrowserRouterUnwrapped {...props} />
-    </SingletonProvider>
-);
-
-function createHashBrowserHistory({
-    basename = '',
-    ...props
-}: BrowserHistoryBuildOptions): History {
-    function convertLocationToHashRouterView(l: Location): Location {
-        let search = '';
-        let pathname = l.hash ? l.hash.substring(1) : '/';
-        if (basename) {
-            pathname = stripBasename(pathname, basename);
-        }
-        const index = pathname.indexOf('?');
-        if (index !== -1) {
-            search = pathname.substring(index);
-            pathname = pathname.substring(0, index);
-        }
-        return {
-            ...l,
-            search,
-            pathname,
-            hash: '',
-        };
-    }
-
-    const parent = createBrowserHistory(props);
-
-    const history: Omit<History, 'length' | 'action' | 'go' | 'goBack' | 'goForward'> = {
-        createHref: location => '/#' + basename + parent.createHref(location),
-
-        push: (path, state?: LocationState) => {
-            if (typeof path === 'string') {
-                if (path.startsWith('/#')) {
-                    parent.push(path, state);
-                } else {
-                    parent.push('/#' + basename + path, state);
-                }
-            } else {
-                if (path.hash) {
-                    parent.push(path);
-                } else {
-                    parent.push({
-                        ...path,
-                        pathname: '/',
-                        hash: path.pathname !== undefined ? basename + path.pathname : undefined,
-                    });
-                }
-            }
-
-            triggerSammyLocationChange();
-        },
-
-        replace: (path, state?: LocationState) => {
-            if (typeof path === 'string') {
-                if (path.startsWith('/#')) {
-                    parent.replace(path, state);
-                } else {
-                    parent.replace('/#' + basename + path, state);
-                }
-            } else {
-                if (path.hash) {
-                    parent.replace(path);
-                } else {
-                    parent.replace({
-                        ...path,
-                        pathname: '/',
-                        hash: path.pathname !== undefined ? basename + path.pathname : undefined,
-                    });
-                }
-            }
-
-            triggerSammyLocationChange();
-        },
-
-        block: prompt => {
-            if (typeof prompt === 'function') {
-                return parent.block((origLocation, action) => {
-                    return prompt(convertLocationToHashRouterView(origLocation), action);
-                });
-            }
-
-            return parent.block(prompt);
-        },
-
-        listen: listener => {
-            return parent.listen((origLocation, action) => {
-                listener(convertLocationToHashRouterView(origLocation), action);
-            });
-        },
-
-        get location() {
-            return convertLocationToHashRouterView(parent.location);
-        },
-        set location(l) {
-            parent.location = l;
-        },
-    };
-
-    return Object.setPrototypeOf(history, parent);
-}
-
-function hasBasename(path: string, prefix: string) {
-    return (
-        path.toLowerCase().indexOf(prefix.toLowerCase()) === 0 &&
-        '/?#'.indexOf(path.charAt(prefix.length)) !== -1
-    );
-}
-
-function stripBasename(path: string, prefix: string) {
-    return hasBasename(path, prefix) ? path.substring(prefix.length) : path;
-}
-
-function triggerSammyLocationChange() {
-    /*
-     * We have to skip ahead `componentWillUnmount` to avoid «race condition»
-     * e.g. in the SettingsLayout component "window.app.swap" could be fired after
-     * the new Sammy route load and it would hide that page.
-     */
-    setTimeout(() => {
-        window.dispatchEvent(new HashChangeEvent('hashchange'));
-    });
-}
+    return <Router history={history} {...props} />;
+});

package/src/trigger-sammy-location-change.ts

@@ -0,0 +1,10 @@
+export function triggerSammyLocationChange() {
+    /*
+     * We have to skip ahead `componentWillUnmount` to avoid «race condition»
+     * e.g. in the SettingsLayout component "window.app.swap" could be fired after
+     * the new Sammy route load and it would hide that page.
+     */
+    setTimeout(() => {
+        window.dispatchEvent(new HashChangeEvent('hashchange'));
+    });
+}

package/src/use-history.ts

@@ -0,0 +1,21 @@
+import { useDependencies } from '@servicetitan/react-ioc';
+import { HistoryManager } from '@servicetitan/web-components';
+import { BrowserHistoryBuildOptions } from 'history';
+import { useEffect, useRef } from 'react';
+import { createHashBrowserHistory } from './create-hash-browser-history';
+
+export function useHistory(options: BrowserHistoryBuildOptions) {
+    const history = useRef(createHashBrowserHistory(options)).current;
+
+    const [historyManager] = useDependencies(HistoryManager);
+
+    useEffect(() => {
+        historyManager.register(history);
+
+        return () => {
+            historyManager.unregister(history);
+        };
+    }, [history, historyManager]);
+
+    return history;
+}

package/dist/singleton-provider.d.ts

@@ -1,8 +0,0 @@
-import { interfaces } from '@servicetitan/react-ioc';
-interface SingletonProviderProps<T> {
-    provide: interfaces.Newable<T>;
-    children: JSX.Element;
-}
-export declare const SingletonProvider: <T extends any>({ provide, children, }: SingletonProviderProps<T>) => import("react/jsx-runtime").JSX.Element;
-export {};
-//# sourceMappingURL=singleton-provider.d.ts.map

package/dist/singleton-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"singleton-provider.d.ts","sourceRoot":"","sources":["../src/singleton-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqC,MAAM,yBAAyB,CAAC;AAExF,UAAU,sBAAsB,CAAC,CAAC;IAC9B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/B,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CACzB;AAID,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,GAAG,EAAE,wBAG9C,sBAAsB,CAAC,CAAC,CAAC,4CAQ3B,CAAC"}

package/dist/singleton-provider.js

@@ -1,18 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useOptionalDependencies, Provider } from '@servicetitan/react-ioc';
-// Re-use instance if already exists
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
-export const SingletonProvider = ({ provide, children })=>{
-    const [instance] = useOptionalDependencies(provide);
-    return /*#__PURE__*/ _jsx(Provider, {
-        singletons: [
-            instance ? {
-                provide,
-                useValue: instance
-            } : provide
-        ],
-        children: children
-    });
-};
-
-//# sourceMappingURL=singleton-provider.js.map

package/dist/singleton-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/singleton-provider.tsx"],"sourcesContent":["import { interfaces, useOptionalDependencies, Provider } from '@servicetitan/react-ioc';\n\ninterface SingletonProviderProps<T> {\n    provide: interfaces.Newable<T>;\n    children: JSX.Element;\n}\n\n// Re-use instance if already exists\n// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint\nexport const SingletonProvider = <T extends any>({\n    provide,\n    children,\n}: SingletonProviderProps<T>) => {\n    const [instance] = useOptionalDependencies(provide);\n\n    return (\n        <Provider singletons={[instance ? { provide, useValue: instance } : provide]}>\n            {children}\n        </Provider>\n    );\n};\n"],"names":["useOptionalDependencies","Provider","SingletonProvider","provide","children","instance","singletons","useValue"],"mappings":";AAAA,SAAqBA,uBAAuB,EAAEC,QAAQ,QAAQ,0BAA0B;AAOxF,oCAAoC;AACpC,6EAA6E;AAC7E,OAAO,MAAMC,oBAAoB,CAAgB,EAC7CC,OAAO,EACPC,QAAQ,EACgB;IACxB,MAAM,CAACC,SAAS,GAAGL,wBAAwBG;IAE3C,qBACI,KAACF;QAASK,YAAY;YAACD,WAAW;gBAAEF;gBAASI,UAAUF;YAAS,IAAIF;SAAQ;kBACvEC;;AAGb,EAAE"}

package/src/singleton-provider.tsx

@@ -1,21 +0,0 @@
-import { interfaces, useOptionalDependencies, Provider } from '@servicetitan/react-ioc';
-
-interface SingletonProviderProps<T> {
-    provide: interfaces.Newable<T>;
-    children: JSX.Element;
-}
-
-// Re-use instance if already exists
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
-export const SingletonProvider = <T extends any>({
-    provide,
-    children,
-}: SingletonProviderProps<T>) => {
-    const [instance] = useOptionalDependencies(provide);
-
-    return (
-        <Provider singletons={[instance ? { provide, useValue: instance } : provide]}>
-            {children}
-        </Provider>
-    );
-};