@etsoo/react 1.5.32 → 1.5.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/lib/components/GridColumn.d.ts +1 -1
  2. package/lib/mu/FabBox.js +9 -7
  3. package/lib/mu/pages/CommonPage.js +1 -5
  4. package/lib/states/CultureState.d.ts +2 -2
  5. package/lib/states/PageState.d.ts +2 -2
  6. package/lib/states/UserState.d.ts +2 -2
  7. package/package.json +2 -2
  8. package/src/mu/FabBox.tsx +9 -7
  9. package/src/mu/pages/CommonPage.tsx +1 -6
  10. package/src/states/CultureState.ts +2 -2
  11. package/src/states/PageState.ts +2 -2
  12. package/src/states/UserState.ts +2 -2
package/lib/components/GridColumn.d.ts CHANGED
@@ -15,7 +15,7 @@ export declare type GridAlign = 'center' | 'inherit' | 'justify' | 'left' | 'rig
15
15
  * @param align Align
16
16
  * @param type Data type
17
17
  */
18
- export declare const GridAlignGet: (align?: GridAlign | undefined, type?: DataTypes.CombinedEnum | undefined) => GridAlign | undefined;
18
+ export declare const GridAlignGet: (align?: GridAlign, type?: GridDataType) => GridAlign | undefined;
19
19
  /**
20
20
  * Grid cell value type
21
21
  */
package/lib/mu/FabBox.js CHANGED
@@ -18,12 +18,14 @@ export function FabBox(props) {
18
18
  ? { marginTop: spaceGap }
19
19
  : { marginLeft: spaceGap };
20
20
  // Default style
21
- Object.assign(sx, {
22
- position: 'fixed',
23
- display: 'flex',
24
- alignItems: 'center',
25
- flexDirection: columnDirection ? 'column' : 'row',
26
- '& > :not(style) + :not(style)': margin
27
- });
21
+ if (typeof sx === 'object') {
22
+ Object.assign(sx, {
23
+ position: 'fixed',
24
+ display: 'flex',
25
+ alignItems: 'center',
26
+ flexDirection: columnDirection ? 'column' : 'row',
27
+ '& > :not(style) + :not(style)': margin
28
+ });
29
+ }
28
30
  return React.createElement(Box, { sx: sx, ...rest });
29
31
  }
package/lib/mu/pages/CommonPage.js CHANGED
@@ -18,11 +18,7 @@ export const CommonPageScrollContainer = global;
18
18
  */
19
19
  export function CommonPage(props) {
20
20
  // Destruct
21
- const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, supportBack = false, targetFields, sx = {}, ...rest } = props;
22
- // Merge style
23
- Object.assign(sx, {
24
- padding: paddings
25
- });
21
+ const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, supportBack = false, targetFields, sx = { padding: paddings }, ...rest } = props;
26
22
  // Fab padding
27
23
  const fabPadding = MUGlobal.increase(MUGlobal.pagePaddings, fabPaddingAdjust);
28
24
  // Labels
package/lib/states/CultureState.d.ts CHANGED
@@ -30,11 +30,11 @@ export declare class CultureState {
30
30
  /**
31
31
  * Context
32
32
  */
33
- readonly context: React.Context<CultureCalls>;
33
+ readonly context: import("react").Context<CultureCalls>;
34
34
  /**
35
35
  * Provider
36
36
  */
37
- readonly provider: React.FunctionComponent<CultureProviderProps>;
37
+ readonly provider: import("react").FunctionComponent<import("react").PropsWithChildren<IProviderProps<CultureAction>>>;
38
38
  /**
39
39
  * Constructor
40
40
  */
package/lib/states/PageState.d.ts CHANGED
@@ -46,11 +46,11 @@ export declare class PageState<D extends IPageData> {
46
46
  /**
47
47
  * Context
48
48
  */
49
- readonly context: React.Context<PageCalls<D>>;
49
+ readonly context: import("react").Context<PageCalls<D>>;
50
50
  /**
51
51
  * Provider
52
52
  */
53
- readonly provider: React.FunctionComponent<PageProviderProps<D>>;
53
+ readonly provider: import("react").FunctionComponent<import("react").PropsWithChildren<IProviderProps<PageAction<D>>>>;
54
54
  /**
55
55
  * Constructor
56
56
  */
package/lib/states/UserState.d.ts CHANGED
@@ -44,11 +44,11 @@ export declare class UserState<D extends IUser> {
44
44
  /**
45
45
  * Context
46
46
  */
47
- readonly context: React.Context<UserCalls<D>>;
47
+ readonly context: import("react").Context<UserCalls<D>>;
48
48
  /**
49
49
  * Provider
50
50
  */
51
- readonly provider: React.FunctionComponent<UserProviderProps<D>>;
51
+ readonly provider: import("react").FunctionComponent<import("react").PropsWithChildren<IProviderProps<UserAction<D>>>>;
52
52
  /**
53
53
  * Constructor
54
54
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/react",
3
- "version": "1.5.32",
3
+ "version": "1.5.33",
4
4
  "description": "TypeScript ReactJs framework",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -93,6 +93,6 @@
93
93
  "jest-environment-jsdom": "^28.1.0",
94
94
  "react-test-renderer": "^18.1.0",
95
95
  "ts-jest": "^28.0.3",
96
- "typescript": "^4.6.4"
96
+ "typescript": "^4.7.2"
97
97
  }
98
98
  }
package/src/mu/FabBox.tsx CHANGED
@@ -37,13 +37,15 @@ export function FabBox(props: FabBoxProps) {
37
37
  : { marginLeft: spaceGap };
38
38
 
39
39
  // Default style
40
- Object.assign(sx, {
41
- position: 'fixed',
42
- display: 'flex',
43
- alignItems: 'center',
44
- flexDirection: columnDirection ? 'column' : 'row',
45
- '& > :not(style) + :not(style)': margin
46
- });
40
+ if (typeof sx === 'object') {
41
+ Object.assign(sx as any, {
42
+ position: 'fixed',
43
+ display: 'flex',
44
+ alignItems: 'center',
45
+ flexDirection: columnDirection ? 'column' : 'row',
46
+ '& > :not(style) + :not(style)': margin
47
+ });
48
+ }
47
49
 
48
50
  return <Box sx={sx} {...rest} />;
49
51
  }
package/src/mu/pages/CommonPage.tsx CHANGED
@@ -37,15 +37,10 @@ export function CommonPage(props: CommonPageProps) {
37
37
  scrollContainer,
38
38
  supportBack = false,
39
39
  targetFields,
40
- sx = {},
40
+ sx = { padding: paddings },
41
41
  ...rest
42
42
  } = props;
43
43
 
44
- // Merge style
45
- Object.assign(sx, {
46
- padding: paddings
47
- });
48
-
49
44
  // Fab padding
50
45
  const fabPadding = MUGlobal.increase(
51
46
  MUGlobal.pagePaddings,
package/src/states/CultureState.ts CHANGED
@@ -46,12 +46,12 @@ export class CultureState {
46
46
  /**
47
47
  * Context
48
48
  */
49
- readonly context: React.Context<CultureCalls>;
49
+ readonly context;
50
50
 
51
51
  /**
52
52
  * Provider
53
53
  */
54
- readonly provider: React.FunctionComponent<CultureProviderProps>;
54
+ readonly provider;
55
55
 
56
56
  /**
57
57
  * Constructor
package/src/states/PageState.ts CHANGED
@@ -58,12 +58,12 @@ export class PageState<D extends IPageData> {
58
58
  /**
59
59
  * Context
60
60
  */
61
- readonly context: React.Context<PageCalls<D>>;
61
+ readonly context;
62
62
 
63
63
  /**
64
64
  * Provider
65
65
  */
66
- readonly provider: React.FunctionComponent<PageProviderProps<D>>;
66
+ readonly provider;
67
67
 
68
68
  /**
69
69
  * Constructor
package/src/states/UserState.ts CHANGED
@@ -58,12 +58,12 @@ export class UserState<D extends IUser> {
58
58
  /**
59
59
  * Context
60
60
  */
61
- readonly context: React.Context<UserCalls<D>>;
61
+ readonly context;
62
62
 
63
63
  /**
64
64
  * Provider
65
65
  */
66
- readonly provider: React.FunctionComponent<UserProviderProps<D>>;
66
+ readonly provider;
67
67
 
68
68
  /**
69
69
  * Constructor