@j2inn/fin5-ui-utils 6.1.0 → 7.0.0

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 (5) hide show
  1. package/dist/react/hooks/useFin5ColorScheme.js +22 -5
  2. package/dist/react/hooks/useFin5ColorScheme.js.map +1 -1
  3. package/dist_es/react/hooks/useFin5ColorScheme.js +22 -5
  4. package/dist_es/react/hooks/useFin5ColorScheme.js.map +1 -1
  5. package/package.json +1 -1
package/dist/react/hooks/useFin5ColorScheme.js CHANGED
@@ -10,7 +10,20 @@ const fin5Top_1 = require("../../fin5Top/fin5Top");
10
10
  const react_1 = require("react");
11
11
  function useFin5ColorScheme() {
12
12
  const theme = (0, react_jss_1.useTheme)();
13
- const colorScheme = (0, fin5Top_1.getFin5top)()?.app.GetColorScheme?.();
13
+ const fin5 = (0, fin5Top_1.getFin5top)();
14
+ const colorScheme = fin5?.app.GetColorScheme?.();
15
+ const currentTheme = fin5?.app.get('currentTheme');
16
+ const isDarkMode = currentTheme === 'dark';
17
+ if (isDarkMode && colorScheme) {
18
+ const primaryColor = fin5?.document
19
+ ?.querySelector('html.theme-dark .app-launcher .app-item.selected')
20
+ ?.computedStyleMap()
21
+ ?.get('background-color')
22
+ ?.toString();
23
+ if (primaryColor) {
24
+ colorScheme.primary = primaryColor;
25
+ }
26
+ }
14
27
  const brandedTheme = (0, react_1.useMemo)(() => {
15
28
  if (!colorScheme) {
16
29
  return undefined;
@@ -23,6 +36,8 @@ function useFin5ColorScheme() {
23
36
  },
24
37
  dark: {
25
38
  ...ui_1.DEFAULT_THEME.dark,
39
+ textColor: (0, ui_1.tint)(colorScheme.bodyBackground, 100),
40
+ popupBgColor: colorScheme.bodyBackground,
26
41
  bodyBg: colorScheme.bodyBackground,
27
42
  bgColor: (0, ui_1.lighten)(colorScheme.bodyBackground, 5),
28
43
  },
@@ -38,13 +53,15 @@ function useFin5ColorScheme() {
38
53
  colorScheme?.bodyBackground,
39
54
  colorScheme?.sidebarBackground,
40
55
  ]);
41
- if (brandedTheme && theme.type === 'light') {
42
- return brandedTheme.light;
56
+ if (!brandedTheme) {
57
+ return theme;
43
58
  }
44
- if (brandedTheme && theme.type === 'dark') {
59
+ if (isDarkMode) {
45
60
  return brandedTheme.dark;
46
61
  }
47
- return theme;
62
+ else {
63
+ return brandedTheme.light;
64
+ }
48
65
  }
49
66
  exports.useFin5ColorScheme = useFin5ColorScheme;
50
67
  //# sourceMappingURL=useFin5ColorScheme.js.map
package/dist/react/hooks/useFin5ColorScheme.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,kCAOkB;AAClB,yCAAoC;AACpC,mDAAkD;AAClD,iCAA+B;AAE/B,SAAgB,kBAAkB;IACjC,MAAM,KAAK,GAAG,IAAA,oBAAQ,GAAY,CAAA;IAClC,MAAM,WAAW,GAAG,IAAA,oBAAU,GAAE,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,IAAA,kBAAa,EAAC;YACpB,KAAK,EAAE;gBACN,GAAG,kBAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,kBAAa,CAAC,IAAI;gBACrB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,kBAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,IAAA,UAAK,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC3C,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;IAED,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QAC1C,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;IAED,OAAO,KAAK,CAAA;AACb,CAAC;AAzCD,gDAyCC"}
1
+ {"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,kCAOkB;AAClB,yCAAoC;AACpC,mDAAkD;AAClD,iCAA+B;AAE/B,SAAgB,kBAAkB;IACjC,MAAM,KAAK,GAAG,IAAA,oBAAQ,GAAY,CAAA;IAClC,MAAM,IAAI,GAAG,IAAA,oBAAU,GAAE,CAAA;IACzB,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IAChD,MAAM,YAAY,GAAG,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAA;IACvE,MAAM,UAAU,GAAG,YAAY,KAAK,MAAM,CAAA;IAC1C,IAAI,UAAU,IAAI,WAAW,EAAE;QAC9B,MAAM,YAAY,GAAG,IAAI,EAAE,QAAQ;YAClC,EAAE,aAAa,CAAC,kDAAkD,CAAC;YACnE,EAAE,gBAAgB,EAAE;YACpB,EAAE,GAAG,CAAC,kBAAkB,CAAC;YACzB,EAAE,QAAQ,EAAE,CAAA;QAEb,IAAI,YAAY,EAAE;YACjB,WAAW,CAAC,OAAO,GAAG,YAAY,CAAA;SAClC;KACD;IAED,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,IAAA,kBAAa,EAAC;YACpB,KAAK,EAAE;gBACN,GAAG,kBAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,kBAAa,CAAC,IAAI;gBACrB,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC;gBAChD,YAAY,EAAE,WAAW,CAAC,cAAc;gBACxC,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,kBAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,IAAA,UAAK,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,KAAK,CAAA;KACZ;IAED,IAAI,UAAU,EAAE;QACf,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;SAAM;QACN,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;AACF,CAAC;AA1DD,gDA0DC"}
package/dist_es/react/hooks/useFin5ColorScheme.js CHANGED
@@ -7,7 +7,20 @@ import { getFin5top } from '../../fin5Top/fin5Top';
7
7
  import { useMemo } from 'react';
8
8
  export function useFin5ColorScheme() {
9
9
  const theme = useTheme();
10
- const colorScheme = getFin5top()?.app.GetColorScheme?.();
10
+ const fin5 = getFin5top();
11
+ const colorScheme = fin5?.app.GetColorScheme?.();
12
+ const currentTheme = fin5?.app.get('currentTheme');
13
+ const isDarkMode = currentTheme === 'dark';
14
+ if (isDarkMode && colorScheme) {
15
+ const primaryColor = fin5?.document
16
+ ?.querySelector('html.theme-dark .app-launcher .app-item.selected')
17
+ ?.computedStyleMap()
18
+ ?.get('background-color')
19
+ ?.toString();
20
+ if (primaryColor) {
21
+ colorScheme.primary = primaryColor;
22
+ }
23
+ }
11
24
  const brandedTheme = useMemo(() => {
12
25
  if (!colorScheme) {
13
26
  return undefined;
@@ -20,6 +33,8 @@ export function useFin5ColorScheme() {
20
33
  },
21
34
  dark: {
22
35
  ...DEFAULT_THEME.dark,
36
+ textColor: tint(colorScheme.bodyBackground, 100),
37
+ popupBgColor: colorScheme.bodyBackground,
23
38
  bodyBg: colorScheme.bodyBackground,
24
39
  bgColor: lighten(colorScheme.bodyBackground, 5),
25
40
  },
@@ -35,12 +50,14 @@ export function useFin5ColorScheme() {
35
50
  colorScheme?.bodyBackground,
36
51
  colorScheme?.sidebarBackground,
37
52
  ]);
38
- if (brandedTheme && theme.type === 'light') {
39
- return brandedTheme.light;
53
+ if (!brandedTheme) {
54
+ return theme;
40
55
  }
41
- if (brandedTheme && theme.type === 'dark') {
56
+ if (isDarkMode) {
42
57
  return brandedTheme.dark;
43
58
  }
44
- return theme;
59
+ else {
60
+ return brandedTheme.light;
61
+ }
45
62
  }
46
63
  //# sourceMappingURL=useFin5ColorScheme.js.map
package/dist_es/react/hooks/useFin5ColorScheme.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACN,aAAa,EACb,aAAa,EACb,OAAO,EACP,KAAK,EAEL,IAAI,GACJ,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,QAAQ,EAAY,CAAA;IAClC,MAAM,WAAW,GAAG,UAAU,EAAE,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,aAAa,CAAC;YACpB,KAAK,EAAE;gBACN,GAAG,aAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,aAAa,CAAC,IAAI;gBACrB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC3C,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;IAED,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QAC1C,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;IAED,OAAO,KAAK,CAAA;AACb,CAAC"}
1
+ {"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACN,aAAa,EACb,aAAa,EACb,OAAO,EACP,KAAK,EAEL,IAAI,GACJ,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,QAAQ,EAAY,CAAA;IAClC,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;IACzB,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IAChD,MAAM,YAAY,GAAG,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAA;IACvE,MAAM,UAAU,GAAG,YAAY,KAAK,MAAM,CAAA;IAC1C,IAAI,UAAU,IAAI,WAAW,EAAE;QAC9B,MAAM,YAAY,GAAG,IAAI,EAAE,QAAQ;YAClC,EAAE,aAAa,CAAC,kDAAkD,CAAC;YACnE,EAAE,gBAAgB,EAAE;YACpB,EAAE,GAAG,CAAC,kBAAkB,CAAC;YACzB,EAAE,QAAQ,EAAE,CAAA;QAEb,IAAI,YAAY,EAAE;YACjB,WAAW,CAAC,OAAO,GAAG,YAAY,CAAA;SAClC;KACD;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,aAAa,CAAC;YACpB,KAAK,EAAE;gBACN,GAAG,aAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,aAAa,CAAC,IAAI;gBACrB,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC;gBAChD,YAAY,EAAE,WAAW,CAAC,cAAc;gBACxC,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,KAAK,CAAA;KACZ;IAED,IAAI,UAAU,EAAE;QACf,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;SAAM;QACN,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;AACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@j2inn/fin5-ui-utils",
3
- "version": "6.1.0",
3
+ "version": "7.0.0",
4
4
  "description": "A set of useful client-side utilities useful for creating UI applications on top of FIN 5",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",