@proteinjs/ui 1.0.5 → 1.0.7

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.6](https://github.com/proteinjs/ui/compare/@proteinjs/ui@1.0.5...@proteinjs/ui@1.0.6) (2024-04-29)
+
+
+### Bug Fixes
+
+* use function as prop type for pageContainerSxProps ([7156880](https://github.com/proteinjs/ui/commit/71568808fb39db6c323b275273d9b8e5ba5cb1f5))
+
+
+
+
+
 ## 1.0.1 (2024-04-19)
 
 **Note:** Version bump only for package @proteinjs/ui

package/dist/generated/index.js

@@ -30,7 +30,7 @@ require("react-router");
 require("react-router-dom");
 require("string");
 /** Generate Source Graph */
-var sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"@proteinjs/ui/Page\",\"value\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":\"/Users/brentbahry/workspaces/n3xa/packages/proteinjs/packages/ui/packages/ui/src/router/Page.ts\",\"qualifiedName\":\"@proteinjs/ui/Page\",\"properties\":[{\"name\":\"name\",\"type\":{\"packageName\":\"\",\"name\":\"string\",\"filePath\":null,\"qualifiedName\":\"/string\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"path\",\"type\":{\"packageName\":\"\",\"name\":\"string|string[]\",\"filePath\":null,\"qualifiedName\":\"/string|string[]\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"component\",\"type\":{\"packageName\":\"\",\"name\":\"React.ComponentType<PageComponentProps>\",\"filePath\":null,\"qualifiedName\":\"/React.ComponentType<PageComponentProps>\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"noPageContainer\",\"type\":{\"packageName\":\"\",\"name\":\"boolean\",\"filePath\":null,\"qualifiedName\":\"/boolean\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"auth\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"pageContainerSxProps\",\"type\":{\"packageName\":\"@mui/material\",\"name\":\"SxProps\",\"filePath\":null,\"qualifiedName\":\"@mui/material/SxProps\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"}],\"methods\":[],\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/reflection\",\"name\":\"Loadable\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/reflection/Loadable\",\"properties\":[],\"methods\":[],\"typeParameters\":[],\"directParents\":[]}],\"sourceType\":3}},{\"v\":\"@proteinjs/reflection/Loadable\"},{\"v\":\"/string | React.ComponentType\"},{\"v\":\"/React.FC\"},{\"v\":\"/Partial\"},{\"v\":\"/React.Component\"}],\"edges\":[{\"v\":\"@proteinjs/ui/Page\",\"w\":\"@proteinjs/reflection/Loadable\",\"value\":\"extends interface\"}]}";
+var sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"@proteinjs/ui/Page\",\"value\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":\"/Users/brentbahry/workspaces/n3xa/packages/proteinjs/packages/ui/packages/ui/src/router/Page.ts\",\"qualifiedName\":\"@proteinjs/ui/Page\",\"properties\":[{\"name\":\"name\",\"type\":{\"packageName\":\"\",\"name\":\"string\",\"filePath\":null,\"qualifiedName\":\"/string\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"path\",\"type\":{\"packageName\":\"\",\"name\":\"string|string[]\",\"filePath\":null,\"qualifiedName\":\"/string|string[]\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"component\",\"type\":{\"packageName\":\"\",\"name\":\"React.ComponentType<PageComponentProps>\",\"filePath\":null,\"qualifiedName\":\"/React.ComponentType<PageComponentProps>\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"noPageContainer\",\"type\":{\"packageName\":\"\",\"name\":\"boolean\",\"filePath\":null,\"qualifiedName\":\"/boolean\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"auth\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"pageContainerSxProps\",\"type\":{\"packageName\":\"\",\"name\":\"(theme: Theme) => SxProps\",\"filePath\":null,\"qualifiedName\":\"/(theme: Theme) => SxProps\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"}],\"methods\":[],\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/reflection\",\"name\":\"Loadable\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/reflection/Loadable\",\"properties\":[],\"methods\":[],\"typeParameters\":[],\"directParents\":[]}],\"sourceType\":3}},{\"v\":\"@proteinjs/reflection/Loadable\"},{\"v\":\"/string | React.ComponentType\"},{\"v\":\"/React.FC\"},{\"v\":\"/Partial\"},{\"v\":\"/React.Component\"}],\"edges\":[{\"v\":\"@proteinjs/ui/Page\",\"w\":\"@proteinjs/reflection/Loadable\",\"value\":\"extends interface\"}]}";
 /** Generate Source Links */
 var sourceLinks = {};
 /** Load Source Graph and Links */

package/dist/generated/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,0BAAwB;AACxB,2BAAyB;AACzB,+BAA6B;AAC7B,yBAAuB;AACvB,iCAA+B;AAC/B,2BAAyB;AACzB,mBAAiB;AACjB,kBAAgB;AAChB,wBAAsB;AACtB,iBAAe;AACf,qBAAmB;AACnB,wBAAsB;AACtB,4BAA0B;AAC1B,kBAAgB;AAGhB,4BAA4B;AAE5B,IAAM,WAAW,GAAG,khHAAkhH,CAAC;AAGviH,4BAA4B;AAG5B,IAAM,WAAW,GAAG,EACnB,CAAC;AAGF,kCAAkC;AAElC,oDAAyD;AACzD,6BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAGjD,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,0BAAwB;AACxB,2BAAyB;AACzB,+BAA6B;AAC7B,yBAAuB;AACvB,iCAA+B;AAC/B,2BAAyB;AACzB,mBAAiB;AACjB,kBAAgB;AAChB,wBAAsB;AACtB,iBAAe;AACf,qBAAmB;AACnB,wBAAsB;AACtB,4BAA0B;AAC1B,kBAAgB;AAGhB,4BAA4B;AAE5B,IAAM,WAAW,GAAG,4hHAA4hH,CAAC;AAGjjH,4BAA4B;AAG5B,IAAM,WAAW,GAAG,EACnB,CAAC;AAGF,kCAAkC;AAElC,oDAAyD;AACzD,6BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAGjD,2CAAyB"}

package/dist/src/container/PageContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PageContainer.d.ts","sourceRoot":"","sources":["../../../src/container/PageContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,gBAAgB,EAAe,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAW,WAAW,EAAE,MAAM,WAAW,CAAC;AAG/D,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAClC,IAAI,CAAC,EAAE;QACH,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;QACrC,+DAA+D;QAC/D,KAAK,EAAE,YAAY,CAAC;QACpB,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;KAChC,CAAC;IACF,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,EAAE,CAAC;IAC5D,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;CAChC,CAAA;AAED,QAAA,MAAM,IAAI;UAAgF,kBAAkB,CAAC,MAAM,CAAC;UAAQ,kBAAkB,CAAC,MAAM,CAAC;cAAY,gBAAgB;kBAAgB,OAAO;oCAAkC,OAAO,KAAK,IAAI;+BAazP,CAAC;AAEH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,qBAoEtD"}
+{"version":3,"file":"PageContainer.d.ts","sourceRoot":"","sources":["../../../src/container/PageContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,gBAAgB,EAAe,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAW,WAAW,EAAE,MAAM,WAAW,CAAC;AAG/D,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAClC,IAAI,CAAC,EAAE;QACH,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;QACrC,+DAA+D;QAC/D,KAAK,EAAE,YAAY,CAAC;QACpB,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;KAChC,CAAC;IACF,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,EAAE,CAAC;IAC5D,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;CAChC,CAAA;AAED,QAAA,MAAM,IAAI;UAAgF,kBAAkB,CAAC,MAAM,CAAC;UAAQ,kBAAkB,CAAC,MAAM,CAAC;cAAY,gBAAgB;kBAAgB,OAAO;oCAAkC,OAAO,KAAK,IAAI;+BAazP,CAAC;AAEH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,qBAgEtD"}

package/dist/src/container/PageContainer.js

@@ -43,11 +43,7 @@ function PageContainer(props) {
             var defaultStyles = {};
             if (!page.pageContainerSxProps)
                 return defaultStyles;
-            var resolvedStyles;
-            if (typeof page.pageContainerSxProps === 'function')
-                resolvedStyles = Object.assign(defaultStyles, page.pageContainerSxProps(theme));
-            else
-                resolvedStyles = Object.assign(defaultStyles, page.pageContainerSxProps);
+            var resolvedStyles = Object.assign({}, defaultStyles, page.pageContainerSxProps(theme));
             return resolvedStyles;
         } },
         react_1.default.createElement(material_1.AppBar, { position: 'static' },

package/dist/src/container/PageContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageContainer.js","sourceRoot":"","sources":["../../../src/container/PageContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PageContainer.js","sourceRoot":"","sources":["../../../src/container/PageContainer.tsx"],"names":[],"mappings":";;;;;;AAAA,gDAA0B;AAC1B,0CAA6E;AAC7E,kEAAgD;AAChD,qDAAiE;AAEjE,6DAA4D;AAC5D,qCAA+D;AAC/D,yDAAwD;AAiBxD,IAAM,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,UAAC,EAAoO;QAAlO,IAAI,UAAA,EAAE,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,YAAY,kBAAA,EAAE,eAAe,qBAAA;IAC1E,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAC,IAAI,CAAC;QACvB,OAAO,8BAAC,IAAI,CAAC,SAAS,IAAC,SAAS,EAAE,IAAA,iCAAe,GAAE,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAAC;IAEhF,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA,EAAE;QACnB,IAAI,CAAC,YAAY;YACb,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1B,OAAO,IAAI,CAAC;KACf;IAED,QAAQ,CAAC,GAAG,CAAC,CAAC;IACd,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,SAAgB,aAAa,CAAC,KAAyB;IACnD,IAAM,QAAQ,GAAG,IAAA,8BAAW,GAAE,CAAC;IACvB,IAAA,OAAO,GAAkE,KAAK,QAAvE,EAAE,IAAI,GAA4D,KAAK,KAAjE,EAAE,eAAe,GAA2C,KAAK,gBAAhD,EAAE,IAAI,GAAqC,KAAK,KAA1C,EAAE,gBAAgB,GAAmB,KAAK,iBAAxB,EAAE,YAAY,GAAK,KAAK,aAAV,CAAW;IACjF,IAAA,KAAkC,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAtD,YAAY,QAAA,EAAE,eAAe,QAAyB,CAAC;IACxD,IAAA,KAAgC,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAApD,WAAW,QAAA,EAAE,cAAc,QAAyB,CAAC;IAE5D,eAAK,CAAC,SAAS,CAAC;QACZ,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAC,IAAI,CAAC;YACvB,OAAO;QAEX,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAA,KAAK,QAAQ,EAAE;gBACjC,IAAM,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACf;SACJ;IACL,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CACH,8BAAC,cAAG,IAAC,EAAE,EAAE,UAAC,KAAK;YACX,IAAM,aAAa,GAAG,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,oBAAoB;gBAC1B,OAAO,aAAa,CAAC;YAEzB,IAAI,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;YAExF,OAAO,cAAc,CAAC;QAC1B,CAAC;QACG,8BAAC,iBAAM,IAAC,QAAQ,EAAC,QAAQ;YACrB,8BAAC,kBAAO;gBACF,YAAY;oBACV,8BAAC,qBAAU,kBACI,MAAM,EACjB,OAAO,EAAE,UAAA,KAAK,IAAI,OAAA,cAAc,CAAC,CAAC,WAAW,CAAC,EAA5B,CAA4B,EAC9C,EAAE,EAAE,UAAC,KAAK,IAAK,OAAA,CAAC;4BACZ,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;4BAC7B,SAAS,EAAE;gCACP,KAAK,EAAE,MAAM;6BAChB;yBACJ,CAAC,EALa,CAKb,EACF,KAAK,EAAE,EAAE,eAAe,EAAE,aAAa,EAAE;wBAEzC,8BAAC,cAAQ,OAAG,CACH;gBAEjB,8BAAC,qBAAU,IAAC,OAAO,EAAC,IAAI,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,cAAc,GAAG,IAC/D,OAAO,CACC;gBACZ,eAAe;gBAChB,8BAAC,qCAAiB,IAAC,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,GAAI,CAC7H,CACL;QACT,8BAAC,iBAAO,IAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,GAAI;QACjG,8BAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,GAAI,CAChH,CACT,CAAC;IAEF,SAAS,aAAa,CAAC,IAAY;QAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACpB,OAAO,IAAI,CAAC;QAEhB,OAAO,WAAI,IAAI,CAAE,CAAC;IACtB,CAAC;AACL,CAAC;AAhED,sCAgEC"}

package/dist/src/router/Page.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SxProps } from '@mui/material';
+import { SxProps, Theme } from '@mui/material';
 import { Loadable } from '@proteinjs/reflection';
 import { NavigateFunction } from 'react-router-dom';
 export declare const getPages: () => Page[];
@@ -23,6 +23,6 @@ export interface Page extends Loadable {
         /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */
         roles?: string[];
     };
-    pageContainerSxProps?: SxProps;
+    pageContainerSxProps?: (theme: Theme) => SxProps;
 }
 //# sourceMappingURL=Page.d.ts.map

package/dist/src/router/Page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../../../src/router/Page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAoB,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,eAAO,MAAM,QAAQ,cAAmE,CAAC;AAEzF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IACnC,QAAQ,EAAE,gBAAgB,CAAC;CAC9B,CAAA;AAED,MAAM,WAAW,IAAK,SAAQ,QAAQ;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAC,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IACnD,8EAA8E;IAC9E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE;QACH,0HAA0H;QAC1H,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,iIAAiI;QACjI,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,6HAA6H;QAC7H,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IACF,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC"}
+{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../../../src/router/Page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAoB,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,eAAO,MAAM,QAAQ,cAAmE,CAAC;AAEzF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IACnC,QAAQ,EAAE,gBAAgB,CAAC;CAC9B,CAAA;AAED,MAAM,WAAW,IAAK,SAAQ,QAAQ;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAC,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IACnD,8EAA8E;IAC9E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE;QACH,0HAA0H;QAC1H,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,iIAAiI;QACjI,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,6HAA6H;QAC7H,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IACF,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CACpD"}

package/generated/index.ts

@@ -18,7 +18,7 @@ import 'string';
 
 /** Generate Source Graph */
 
-const sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"@proteinjs/ui/Page\",\"value\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":\"/Users/brentbahry/workspaces/n3xa/packages/proteinjs/packages/ui/packages/ui/src/router/Page.ts\",\"qualifiedName\":\"@proteinjs/ui/Page\",\"properties\":[{\"name\":\"name\",\"type\":{\"packageName\":\"\",\"name\":\"string\",\"filePath\":null,\"qualifiedName\":\"/string\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"path\",\"type\":{\"packageName\":\"\",\"name\":\"string|string[]\",\"filePath\":null,\"qualifiedName\":\"/string|string[]\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"component\",\"type\":{\"packageName\":\"\",\"name\":\"React.ComponentType<PageComponentProps>\",\"filePath\":null,\"qualifiedName\":\"/React.ComponentType<PageComponentProps>\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"noPageContainer\",\"type\":{\"packageName\":\"\",\"name\":\"boolean\",\"filePath\":null,\"qualifiedName\":\"/boolean\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"auth\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"pageContainerSxProps\",\"type\":{\"packageName\":\"@mui/material\",\"name\":\"SxProps\",\"filePath\":null,\"qualifiedName\":\"@mui/material/SxProps\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"}],\"methods\":[],\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/reflection\",\"name\":\"Loadable\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/reflection/Loadable\",\"properties\":[],\"methods\":[],\"typeParameters\":[],\"directParents\":[]}],\"sourceType\":3}},{\"v\":\"@proteinjs/reflection/Loadable\"},{\"v\":\"/string | React.ComponentType\"},{\"v\":\"/React.FC\"},{\"v\":\"/Partial\"},{\"v\":\"/React.Component\"}],\"edges\":[{\"v\":\"@proteinjs/ui/Page\",\"w\":\"@proteinjs/reflection/Loadable\",\"value\":\"extends interface\"}]}";
+const sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"@proteinjs/ui/Page\",\"value\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":\"/Users/brentbahry/workspaces/n3xa/packages/proteinjs/packages/ui/packages/ui/src/router/Page.ts\",\"qualifiedName\":\"@proteinjs/ui/Page\",\"properties\":[{\"name\":\"name\",\"type\":{\"packageName\":\"\",\"name\":\"string\",\"filePath\":null,\"qualifiedName\":\"/string\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"path\",\"type\":{\"packageName\":\"\",\"name\":\"string|string[]\",\"filePath\":null,\"qualifiedName\":\"/string|string[]\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"component\",\"type\":{\"packageName\":\"\",\"name\":\"React.ComponentType<PageComponentProps>\",\"filePath\":null,\"qualifiedName\":\"/React.ComponentType<PageComponentProps>\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":false,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"noPageContainer\",\"type\":{\"packageName\":\"\",\"name\":\"boolean\",\"filePath\":null,\"qualifiedName\":\"/boolean\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"auth\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/{\\n        /** If true, the user does not need to be logged in or have any roles to access this page. If blank, defaults to false. */\\n        public?: boolean;\\n        /** If true, the user does not need to have any roles to access this page, but must be logged in. If blank, defaults to false. */\\n        allUsers?: boolean,\\n        /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */\\n        roles?: string[];\\n    }\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"},{\"name\":\"pageContainerSxProps\",\"type\":{\"packageName\":\"\",\"name\":\"(theme: Theme) => SxProps\",\"filePath\":null,\"qualifiedName\":\"/(theme: Theme) => SxProps\",\"typeParameters\":null,\"directParents\":null},\"isOptional\":true,\"isAbstract\":false,\"isStatic\":false,\"visibility\":\"public\"}],\"methods\":[],\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/reflection\",\"name\":\"Loadable\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/reflection/Loadable\",\"properties\":[],\"methods\":[],\"typeParameters\":[],\"directParents\":[]}],\"sourceType\":3}},{\"v\":\"@proteinjs/reflection/Loadable\"},{\"v\":\"/string | React.ComponentType\"},{\"v\":\"/React.FC\"},{\"v\":\"/Partial\"},{\"v\":\"/React.Component\"}],\"edges\":[{\"v\":\"@proteinjs/ui/Page\",\"w\":\"@proteinjs/reflection/Loadable\",\"value\":\"extends interface\"}]}";
 
 
 /** Generate Source Links */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@proteinjs/ui",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "description": "UI libs",
     "publishConfig": {
         "access": "public"
@@ -37,7 +37,7 @@
         "string": "3.3.3"
     },
     "devDependencies": {
-        "@proteinjs/reflection-build": "1.0.12",
+        "@proteinjs/reflection-build": "1.0.13",
         "@types/node": "14.0.13",
         "@types/react": "18.2.23",
         "@types/react-dom": "18.2.8",

package/src/container/PageContainer.tsx

@@ -62,11 +62,7 @@ export function PageContainer(props: PageContainerProps) {
             if (!page.pageContainerSxProps)
                 return defaultStyles;
 
-            let resolvedStyles;
-            if (typeof page.pageContainerSxProps === 'function')
-                resolvedStyles = Object.assign(defaultStyles, page.pageContainerSxProps(theme));
-            else
-                resolvedStyles = Object.assign(defaultStyles, page.pageContainerSxProps);
+            let resolvedStyles = Object.assign({}, defaultStyles, page.pageContainerSxProps(theme));
 
             return resolvedStyles;
         }}>

package/src/router/Page.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SxProps } from '@mui/material';
+import { SxProps, Theme } from '@mui/material';
 import { Loadable, SourceRepository } from '@proteinjs/reflection';
 import { NavigateFunction } from 'react-router-dom';
 
@@ -24,5 +24,5 @@ export interface Page extends Loadable {
         /** The user must be logged in and have these roles to access this page. If blank, defaults to requiring the 'admin' role. */
         roles?: string[];
     };
-    pageContainerSxProps?: SxProps;
+    pageContainerSxProps?: (theme: Theme) => SxProps;
 }