@a-type/ui 6.0.65 → 6.0.67

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 (19) hide show
  1. package/dist/arbor/arbor.d.ts +3 -1
  2. package/dist/arbor/arbor.js +6 -2
  3. package/dist/arbor/arbor.js.map +1 -1
  4. package/dist/components/provider/Provider.js +1 -1
  5. package/dist/components/provider/Provider.js.map +1 -1
  6. package/dist/hooks/useTitleBarColor.d.ts +1 -3
  7. package/dist/hooks/useTitleBarColor.js +64 -6
  8. package/dist/hooks/useTitleBarColor.js.map +1 -1
  9. package/dist/hooks/useTitleBarColor.stories.js +1 -1
  10. package/dist/hooks/useTitleBarColor.stories.js.map +1 -1
  11. package/dist/index.d.ts +1 -0
  12. package/dist/index.js +1 -0
  13. package/dist/index.js.map +1 -1
  14. package/package.json +3 -3
  15. package/src/arbor/arbor.ts +8 -3
  16. package/src/components/provider/Provider.tsx +1 -1
  17. package/src/hooks/useTitleBarColor.stories.tsx +1 -1
  18. package/src/hooks/useTitleBarColor.ts +73 -10
  19. package/src/index.ts +2 -0
package/dist/arbor/arbor.d.ts CHANGED
@@ -39,6 +39,8 @@ declare const defaultColors: {
39
39
  export type DefaultColorRangeName = keyof typeof defaultColors.ranges;
40
40
  export type ATypeConfig<TColors extends DefaultColorRangeName = DefaultColorRangeName> = Partial<ArborPresetConfig<TColors>> & {
41
41
  mainColor?: TColors;
42
+ defaultAccentColor?: TColors;
43
+ fallbackAccentColor?: TColors;
42
44
  roundActions?: boolean;
43
45
  roundControls?: boolean;
44
46
  };
@@ -1116,7 +1118,7 @@ export declare function presetAtype<TColors extends DefaultColorRangeName = Defa
1116
1118
  }]>;
1117
1119
  }, "focusRing"> & {
1118
1120
  focusRing: import("@arbor-css/core").ArborFunction<import("@arbor-css/core").FunctionParams>;
1119
- }, Omit<Omit<Omit<{}, "fill" | "stroke" | "accent" | "borderColor" | "shadow" | "ring" | "fg" | "bg" | "accentLighter" | "accentHeavier" | "accentDesaturated" | "accentSaturated" | "accentFaded" | "bgLighter" | "bgHeavier" | "bgDesaturated" | "bgSaturated" | "bgFaded" | "borderColorLighter" | "borderColorHeavier" | "borderColorDesaturated" | "borderColorSaturated" | "borderColorFaded" | "fillLighter" | "fillHeavier" | "fillDesaturated" | "fillSaturated" | "fillFaded" | "fgLighter" | "fgHeavier" | "fgDesaturated" | "fgSaturated" | "fgFaded" | "strokeLighter" | "strokeHeavier" | "strokeDesaturated" | "strokeSaturated" | "strokeFaded"> & {
1121
+ }, Omit<Omit<Omit<{}, "shadow" | "fill" | "stroke" | "accent" | "borderColor" | "ring" | "fg" | "bg" | "accentLighter" | "accentHeavier" | "accentDesaturated" | "accentSaturated" | "accentFaded" | "bgLighter" | "bgHeavier" | "bgDesaturated" | "bgSaturated" | "bgFaded" | "borderColorLighter" | "borderColorHeavier" | "borderColorDesaturated" | "borderColorSaturated" | "borderColorFaded" | "fillLighter" | "fillHeavier" | "fillDesaturated" | "fillSaturated" | "fillFaded" | "fgLighter" | "fgHeavier" | "fgDesaturated" | "fgSaturated" | "fgFaded" | "strokeLighter" | "strokeHeavier" | "strokeDesaturated" | "strokeSaturated" | "strokeFaded"> & {
1120
1122
  readonly shadow: import("@arbor-css/core").ArborMixin<readonly [{
1121
1123
  readonly name: "--shadow";
1122
1124
  readonly fallback: "0 0 0 0 transparent";
package/dist/arbor/arbor.js CHANGED
@@ -40,6 +40,8 @@ const defaultColors = {
40
40
  };
41
41
  export function presetAtype(config) {
42
42
  var _a, _b, _c, _d;
43
+ const defaultAccent = (config === null || config === void 0 ? void 0 : config.defaultAccentColor) || 'leek';
44
+ const fallbackAccent = (config === null || config === void 0 ? void 0 : config.fallbackAccentColor) || 'lemon';
43
45
  const base = presetArbor(Object.assign(Object.assign({}, config), { color: Object.assign(Object.assign({ globalSaturation: 0.5 }, config === null || config === void 0 ? void 0 : config.color), { ranges: Object.assign(Object.assign({}, defaultColors.ranges), (_a = config === null || config === void 0 ? void 0 : config.color) === null || _a === void 0 ? void 0 : _a.ranges), mainColor: (config === null || config === void 0 ? void 0 : config.mainColor) ||
44
46
  ((_b = config === null || config === void 0 ? void 0 : config.color) === null || _b === void 0 ? void 0 : _b.mainColor) ||
45
47
  defaultColors.mainColor }), typography: Object.assign({ defaultFontSize: '16px', minFontSize: '12px', minWeight: 200, maxWeight: 600, baseWeight: 400, lineHeightStep: 0.125, minLineHeight: 1, roundToPixel: true }, config === null || config === void 0 ? void 0 : config.typography), space: Object.assign({ baseSize: '8px', roundToPixel: true }, config === null || config === void 0 ? void 0 : config.space), shape: Object.assign({ roundness: 1.5 }, config === null || config === void 0 ? void 0 : config.shape), shadow: Object.assign({ defaultColor: 'rgba(0, 0, 0, 0.05)' }, config === null || config === void 0 ? void 0 : config.shadow), keyframes: Object.assign({ fadeInUp: (css, $) => css `
@@ -132,7 +134,7 @@ export function presetAtype(config) {
132
134
  extends: [base],
133
135
  baseMode: ($) => ({
134
136
  color: {
135
- accent: $.mode.color.palette.leek,
137
+ accent: $.mode.color.palette[defaultAccent],
136
138
  },
137
139
  action: {
138
140
  roundness: (config === null || config === void 0 ? void 0 : config.roundActions) === false ? undefined : 2,
@@ -333,7 +335,9 @@ export function presetAtype(config) {
333
335
  color: {
334
336
  main: preset.$.mode.color.palette[colorName],
335
337
  // avoid assigning leek to both main and accent
336
- accent: colorName === 'leek' ? preset.$.mode.color.palette.lemon : undefined,
338
+ accent: (colorName === defaultAccent
339
+ ? preset.$.mode.color.palette[fallbackAccent]
340
+ : preset.$.mode.color.palette[defaultAccent]),
337
341
  },
338
342
  });
339
343
  }
package/dist/arbor/arbor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"arbor.js","sourceRoot":"","sources":["../../src/arbor/arbor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"arbor.js","sourceRoot":"","sources":["../../src/arbor/arbor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAEN,kBAAkB,EAClB,WAAW,GACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,aAAa,GAAG;IACrB,MAAM,EAAE;QACP,KAAK,EAAE;YACN,GAAG,EAAE,EAAE;YACP,iBAAiB,EAAE,GAAG;SACtB;QACD,IAAI,EAAE;YACL,GAAG,EAAE,MAAM;YACX,iBAAiB,EAAE,GAAG;SACtB;QACD,MAAM,EAAE;YACP,GAAG,EAAE,KAAK;YACV,iBAAiB,EAAE,GAAG;SACtB;QACD,SAAS,EAAE;YACV,GAAG,EAAE,MAAM;YACX,iBAAiB,EAAE,GAAG;SACtB;QACD,QAAQ,EAAE;YACT,GAAG,EAAE,MAAM;YACX,iBAAiB,EAAE,GAAG;SACtB;QACD,SAAS,EAAE;YACV,GAAG,EAAE,EAAE;YACP,iBAAiB,EAAE,GAAG;SACtB;QACD,OAAO,EAAE;YACR,GAAG,EAAE,GAAG;YACR,iBAAiB,EAAE,GAAG;SACtB;QACD,IAAI,EAAE;YACL,GAAG,EAAE,CAAC;YACN,iBAAiB,EAAE,GAAG;SACtB;KACD;IACD,SAAS,EAAE,OAAO;CAClB,CAAC;AAcF,MAAM,UAAU,WAAW,CAEzB,MAA6B;;IAC9B,MAAM,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,KAAI,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,mBAAmB,KAAI,OAAO,CAAC;IAC9D,MAAM,IAAI,GAAG,WAAW,iCACpB,MAAM,KACT,KAAK,gCACJ,gBAAgB,EAAE,GAAG,IAClB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAChB,MAAM,kCACF,aAAa,CAAC,MAAM,GACpB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,0CAAE,MAAM,GAEzB,SAAS,EACR,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS;iBACjB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,0CAAE,SAAS,CAAA;gBACxB,aAAa,CAAC,SAAS,KAEzB,UAAU,kBACT,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,GAAG,EACd,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,KAAK,EACrB,aAAa,EAAE,CAAC,EAChB,YAAY,EAAE,IAAI,IACf,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,GAEtB,KAAK,kBACJ,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,IAAI,IACf,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,GAEjB,KAAK,kBACJ,SAAS,EAAE,GAAG,IACX,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,GAEjB,MAAM,kBACL,YAAY,EAAE,qBAAqB,IAChC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,GAElB,SAAS,kBACR,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;6BAGC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;;;;;IAMxC,EACD,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;8BAGA,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;;;;;IAMzC,EACD,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;6BAGF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;;;;;IAMxC,EACD,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;8BAOC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;IAEzC,EACD,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;8BAOD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;IAEzC,EACD,YAAY,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;6BAOH,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;IAExC,EACD,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;6BAOF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;;IAExC,EACD,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;IAOpB,EACD,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;IAOnB,EACD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;IAOjB,IACE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAEpB,CAAC;IAEH,MAAM,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,IAAI,CAAC;QACf,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjB,KAAK,EAAE;gBACN,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;aAC3C;YACD,MAAM,EAAE;gBACP,SAAS,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,MAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAEzD,KAAK,EAAE;oBACN,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;oBAC3B,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc;oBAChC,MAAM,EAAE,GAAG,CAAA;QACR,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;yBACtD,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW;MAChD;oBACD,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;oBAC5B,WAAW,EAAE,OAAO;oBACpB,WAAW,EAAE,KAAK;iBAClB;gBACD,OAAO,EAAE;oBACR,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;iBAC5B;gBACD,SAAS,EAAE;oBACV,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;iBAC5B;aACD;YACD,OAAO,EAAE;gBACR,SAAS,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBAChD,OAAO,EAAE;oBACR,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;iBACtB;aACD;YACD,OAAO,EAAE;gBACR,SAAS,EAAE,CAAC;aACZ;YACD,IAAI,EAAE;gBACL,GAAG,EAAE,CAAC;gBACN,UAAU,EAAE,CAAC;aACb;YACD,SAAS,EAAE;gBACV,KAAK,EAAE;oBACN,IAAI,EAAE,kBAAkB,CACvB;wBACC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;wBACpB,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU;qBAClC,EACD,CAAC,CAAC,IAAI,CAAC,MAAM,CACb;iBACD;aACD;SACD,CAAC;QACF,UAAU,EAAE;YACX,KAAK,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;aAClC;YACD,IAAI,EAAE;gBACL,GAAG,EAAE;oBACJ,OAAO,EAAE,OAAO;oBAChB,WAAW,EAAE,wBAAwB;iBACrC;gBACD,UAAU,EAAE;oBACX,OAAO,EAAE,QAAQ;oBACjB,WAAW,EAAE,+CAA+C;iBAC5D;aACD;YACD,MAAM,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO;aACrC;SACD;QACD,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrB,OAAO;gBACN,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;oBACnC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC;wBAC/B,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW;qBAC1C,CAAC;sBACc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW;sBAC/B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW;uBAC9B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;iBAC1B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK;MACtC;iBACD,CAAC;gBACF,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE;oBACtB,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;UAGnB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;UAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBACxB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;4BACrC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;4BAC1B,QAAQ,EAAE,KAAK;yBACf,CAAC;qBACF,CAAC;;;WAGC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;;MAIjD;iBACD,CAAC;gBACF,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE;oBACtB,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;SAMpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBACxB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;4BACrC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;4BAClC,QAAQ,EAAE,KAAK;yBACf,CAAC;qBACF,CAAC;;;UAGC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;MAGhD;iBACD,CAAC;gBACF,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACxB,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;SAEpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;UAG3C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;MAGhD;iBACD,CAAC;gBACF,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE;oBAC5B,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;SAKpB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAChD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBAC3B,WAAW,EAAE,IAAI;wBACjB,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG;qBACpC,CAAC;;MAEH;iBACD,CAAC;aACF,CAAC;QACH,CAAC;QACD,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1B,SAAS,EAAE,MAAM,CAAC,YAAY,EAAE;gBAC/B,UAAU,EAAE;oBACX;wBACC,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,KAAK;qBACf;iBACD;gBACD,UAAU,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAC1B,GAAG,CAAA,SAAS,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;aAC/C,CAAC;SACF,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5B,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,OAAO,CAAQ;SACtE;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC3B,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;SAChC;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5B,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO;SACzC;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;QAC9B,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;SAC3C;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5B,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO;SACjC;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACzB,IAAI,EAAE;YACL,GAAG,EAAE,OAAO,aAAa,QAAQ;YACjC,UAAU,EAAE,OAAO,oBAAoB,MAAM;SAC7C;QACD,KAAK,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI;SACtC;KACD,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,GAAG,CAAwB;QACpD,GAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAA6B;QACjE,GAAG,CAAC,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,0CAAE,MAAM;YACxB,CAAC,CAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAA6B;YAC/D,CAAC,CAAC,EAAE,CAAC;KACN,CAAC,CAAC;IACH,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;YAC5B,KAAK,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;gBAC5C,+CAA+C;gBAC/C,MAAM,EAAE,CAAC,SAAS,KAAK,aAAa;oBACnC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;oBAC7C,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAQ;aACrD;SACD,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;IACnB,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE;QAC1B,MAAM,EAAE;YACP,KAAK,EAAE;gBACN,OAAO,EAAE,IAAI;aACb;YACD,UAAU,EAAE;gBACX,IAAI,EAAE,KAAK;aACX;SACD;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC3B,MAAM,EAAE;YACP,KAAK,EAAE;gBACN,OAAO,EAAE,GAAG;aACZ;YACD,UAAU,EAAE;gBACX,WAAW,EAAE,MAAM;gBACnB,IAAI,EAAE,IAAI;aACV;SACD;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC3B,MAAM,EAAE;YACP,KAAK,EAAE;gBACN,OAAO,EAAE,CAAC;aACV;YACD,UAAU,EAAE;gBACX,IAAI,EAAE,CAAC;gBACP,WAAW,EAAE,MAAM;aACnB;SACD;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE;QAC1B,MAAM,EAAE;YACP,KAAK,EAAE;gBACN,OAAO,EAAE,IAAI;aACb;YACD,UAAU,EAAE;gBACX,IAAI,EAAE,KAAK;aACX;SACD;KACD,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5B,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,GAAG;aACf;SACD;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACzB,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,IAAI,EAAE,CAAC;gBACP,iBAAiB,EAAE,CAAC;aACpB;YACD,KAAK,EAAE;gBACN,OAAO,EAAE,GAAG;aACZ;SACD;KACD,CAAC,CAAC;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACzB,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,SAAS,EAAE,GAAG;gBACd,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,GAAG;aACf;YACD,KAAK,EAAE;gBACN,SAAS,EAAE,CAAC;aACZ;SACD;KACD,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAED,eAAe,WAAW,CAAC"}
package/dist/components/provider/Provider.js CHANGED
@@ -17,7 +17,7 @@ export function Provider({ children, disableParticles, disableViewportOffset, vi
17
17
  ? virtualKeyboardBehavior
18
18
  : 'displace';
19
19
  useVirtualKeyboardBehavior(supportedVirtualKeyboardBehavior);
20
- useThemedTitleBar('gray', 'wash', undefined, disableTitleBarColor);
20
+ useThemedTitleBar('--m-color-main-paper', disableTitleBarColor);
21
21
  const otherStuff = (_jsxs(_Fragment, { children: [_jsx(IconSpritesheet, {}), _jsx(Toaster, {}), manifestPath === false ? null : (_jsx(PwaInstall, { manifestPath: manifestPath }))] }));
22
22
  if (disableParticles)
23
23
  return (_jsx(ConfigContext.Provider, { value: { virtualKeyboardBehavior: supportedVirtualKeyboardBehavior }, children: _jsx(DefaultToastProvider, { children: _jsxs(TooltipProvider, { children: [children, otherStuff] }) }) }));
package/dist/components/provider/Provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/components/provider/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EACN,iBAAiB,EACjB,+BAA+B,EAC/B,uBAAuB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAWtD;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,EACxB,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,GAAG,UAAU,EACpC,oBAAoB,EACpB,YAAY,GACG;IACf,uBAAuB,CAAC,qBAAqB,CAAC,CAAC;IAC/C,+BAA+B,EAAE,CAAC;IAClC,MAAM,gCAAgC,GACrC,OAAO,SAAS,KAAK,WAAW,IAAI,iBAAiB,IAAI,SAAS;QACjE,CAAC,CAAC,uBAAuB;QACzB,CAAC,CAAC,UAAU,CAAC;IACf,0BAA0B,CAAC,gCAAgC,CAAC,CAAC;IAC7D,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,CAClB,8BACC,KAAC,eAAe,KAAG,EACnB,KAAC,OAAO,KAAG,EACV,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChC,KAAC,UAAU,IAAC,YAAY,EAAE,YAAY,GAAI,CAC1C,IACC,CACH,CAAC;IAEF,IAAI,gBAAgB;QACnB,OAAO,CACN,KAAC,aAAa,CAAC,QAAQ,IACtB,KAAK,EAAE,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,YAEpE,KAAC,oBAAoB,cACpB,MAAC,eAAe,eACd,QAAQ,EACR,UAAU,IACM,GACI,GACC,CACzB,CAAC;IAEH,OAAO,CACN,KAAC,aAAa,CAAC,QAAQ,IACtB,KAAK,EAAE,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,YAEpE,KAAC,oBAAoB,cACpB,KAAC,eAAe,cACf,MAAC,aAAa,eACZ,QAAQ,EACR,UAAU,IACI,GACC,GACI,GACC,CACzB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAEvC;IACF,uBAAuB,EAAE,UAAU;CACnC,CAAC,CAAC;AAEH,MAAM,UAAU,SAAS;IACxB,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/components/provider/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EACN,iBAAiB,EACjB,+BAA+B,EAC/B,uBAAuB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAWtD;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,EACxB,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,GAAG,UAAU,EACpC,oBAAoB,EACpB,YAAY,GACG;IACf,uBAAuB,CAAC,qBAAqB,CAAC,CAAC;IAC/C,+BAA+B,EAAE,CAAC;IAClC,MAAM,gCAAgC,GACrC,OAAO,SAAS,KAAK,WAAW,IAAI,iBAAiB,IAAI,SAAS;QACjE,CAAC,CAAC,uBAAuB;QACzB,CAAC,CAAC,UAAU,CAAC;IACf,0BAA0B,CAAC,gCAAgC,CAAC,CAAC;IAC7D,iBAAiB,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,CAClB,8BACC,KAAC,eAAe,KAAG,EACnB,KAAC,OAAO,KAAG,EACV,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChC,KAAC,UAAU,IAAC,YAAY,EAAE,YAAY,GAAI,CAC1C,IACC,CACH,CAAC;IAEF,IAAI,gBAAgB;QACnB,OAAO,CACN,KAAC,aAAa,CAAC,QAAQ,IACtB,KAAK,EAAE,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,YAEpE,KAAC,oBAAoB,cACpB,MAAC,eAAe,eACd,QAAQ,EACR,UAAU,IACM,GACI,GACC,CACzB,CAAC;IAEH,OAAO,CACN,KAAC,aAAa,CAAC,QAAQ,IACtB,KAAK,EAAE,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,YAEpE,KAAC,oBAAoB,cACpB,KAAC,eAAe,cACf,MAAC,aAAa,eACZ,QAAQ,EACR,UAAU,IACI,GACC,GACI,GACC,CACzB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAEvC;IACF,uBAAuB,EAAE,UAAU;CACnC,CAAC,CAAC;AAEH,MAAM,UAAU,SAAS;IACxB,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AAClC,CAAC"}
package/dist/hooks/useTitleBarColor.d.ts CHANGED
@@ -6,6 +6,4 @@ export declare function useSetTitleBarColor(): {
6
6
  setColor: (color: string) => void;
7
7
  resetColor: () => void;
8
8
  };
9
- export declare function useThemedTitleBar(paletteOrName: any, value: any,
10
- /** If not provided, will inherit from app */
11
- mode?: 'light' | 'dark', skip?: boolean): void;
9
+ export declare function useThemedTitleBar(colorToken: string, skip?: boolean): void;
package/dist/hooks/useTitleBarColor.js CHANGED
@@ -1,5 +1,6 @@
1
1
  var _a;
2
- import { useCallback } from 'react';
2
+ import { useCallback, useEffect, useSyncExternalStore } from 'react';
3
+ import { useResolvedColorMode } from '../colorMode.js';
3
4
  let defaultColor = '#ffffff';
4
5
  function getCurrentColor() {
5
6
  var _a;
@@ -29,16 +30,73 @@ function changeThemeColor(color) {
29
30
  console.log('set title bar color', color);
30
31
  }
31
32
  export function useTitleBarColor(color) {
32
- /* TODO: rewrite this */
33
+ const colorMode = useResolvedColorMode();
34
+ useEffect(() => {
35
+ var _a, _b;
36
+ const finalColor = typeof color === 'string'
37
+ ? color
38
+ : colorMode === 'dark'
39
+ ? color.dark
40
+ : color.light;
41
+ const previousColor = (_b = (_a = document
42
+ .querySelector('meta[name=theme-color]')) === null || _a === void 0 ? void 0 : _a.getAttribute('content')) !== null && _b !== void 0 ? _b : defaultColor;
43
+ changeThemeColor(finalColor);
44
+ return () => {
45
+ changeThemeColor(previousColor);
46
+ };
47
+ }, [color, colorMode]);
33
48
  }
34
49
  export function useSetTitleBarColor() {
35
50
  const setColor = useCallback((color) => changeThemeColor(color), []);
36
51
  const resetColor = useCallback(() => changeThemeColor(defaultColor), []);
37
52
  return { setColor, resetColor };
38
53
  }
39
- export function useThemedTitleBar(paletteOrName, value,
40
- /** If not provided, will inherit from app */
41
- mode, skip) {
42
- /* TODO: rewrite this */
54
+ export function useThemedTitleBar(colorToken, skip) {
55
+ const { setColor } = useSetTitleBarColor();
56
+ // using a variable to rerun the effect instead of subscribing in-effect...
57
+ // this is an attempt to preserve the cascading behavior in the React tree
58
+ // if a child calls this hook, so ideally the parent and child should both
59
+ // re-evaluate but the child should 'win'
60
+ const visible = useSyncExternalStore((onStoreChange) => {
61
+ document.addEventListener('visibilitychange', onStoreChange);
62
+ return () => {
63
+ document.removeEventListener('visibilitychange', onStoreChange);
64
+ };
65
+ }, () => document.visibilityState === 'visible', () => true);
66
+ const mode = useResolvedColorMode();
67
+ useEffect(() => {
68
+ if (skip)
69
+ return;
70
+ const previousColor = getCurrentColor();
71
+ async function update() {
72
+ try {
73
+ const { resolveRuntimeValue } = await import('@arbor-css/core/runtime');
74
+ const color = await resolveRuntimeValue(colorToken, {
75
+ tokenPurpose: 'color',
76
+ });
77
+ if (color) {
78
+ setColor(extractLightDark(color, mode));
79
+ }
80
+ }
81
+ catch (e) {
82
+ console.error('Error updating title bar color:', e);
83
+ }
84
+ }
85
+ update();
86
+ if (previousColor) {
87
+ return () => {
88
+ setColor(previousColor);
89
+ };
90
+ }
91
+ }, [setColor, colorToken, skip, visible, mode]);
92
+ }
93
+ function extractLightDark(colorValue, mode) {
94
+ if (colorValue.startsWith('light-dark(')) {
95
+ const colors = colorValue.slice(11, -1).split(',');
96
+ if (colors.length === 2) {
97
+ return mode === 'light' ? colors[0].trim() : colors[1].trim();
98
+ }
99
+ }
100
+ return colorValue;
43
101
  }
44
102
  //# sourceMappingURL=useTitleBarColor.js.map
package/dist/hooks/useTitleBarColor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTitleBarColor.js","sourceRoot":"","sources":["../../src/hooks/useTitleBarColor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,IAAI,YAAY,GAAG,SAAS,CAAC;AAC7B,SAAS,eAAe;;IACvB,OAAO,MAAA,QAAQ;SACb,aAAa,CAAC,wBAAwB,CAAC,0CACtC,YAAY,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC;AACD,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;IACrC,YAAY,GAAG,MAAA,eAAe,EAAE,mCAAI,YAAY,CAAC;AAClD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACtC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACrC,OAAO;IACR,CAAC;IACD,gCAAgC;IAChC,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;IACtE,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAChD,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACnD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC;IACD,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,KAA+C;IAE/C,wBAAwB;AACzB,CAAC;AAED,MAAM,UAAU,mBAAmB;IAClC,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IACzE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,aAAkB,EAClB,KAAU;AACV,6CAA6C;AAC7C,IAAuB,EACvB,IAAc;IAEd,wBAAwB;AACzB,CAAC"}
1
+ {"version":3,"file":"useTitleBarColor.js","sourceRoot":"","sources":["../../src/hooks/useTitleBarColor.ts"],"names":[],"mappings":"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"}
package/dist/hooks/useTitleBarColor.stories.js CHANGED
@@ -46,7 +46,7 @@ function MockTitleBar() {
46
46
  return (_jsxs(Box, { justify: "between", items: "center", p: "md", style: { backgroundColor: color }, children: [_jsx("div", { children: time }), _jsx(Box, { gap: true, items: "center", children: _jsx(Icon, { name: "globe" }) })] }));
47
47
  }
48
48
  function Overrider() {
49
- useThemedTitleBar('primary', 'dark');
49
+ useThemedTitleBar('--m-color-accent-light');
50
50
  return null;
51
51
  }
52
52
  //# sourceMappingURL=useTitleBarColor.stories.js.map
package/dist/hooks/useTitleBarColor.stories.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTitleBarColor.stories.js","sourceRoot":"","sources":["../../src/hooks/useTitleBarColor.stories.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useTitleBarColor.stories.js","sourceRoot":"","sources":["../../src/hooks/useTitleBarColor.stories.tsx"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -2,3 +2,4 @@ export { clsx } from 'clsx';
2
2
  export * from './colorMode.js';
3
3
  export * from './components/index.js';
4
4
  export * from './hooks.js';
5
+ export * as userModeProps from './arbor/props.js';
package/dist/index.js CHANGED
@@ -2,4 +2,5 @@ export { clsx } from 'clsx';
2
2
  export * from './colorMode.js';
3
3
  export * from './components/index.js';
4
4
  export * from './hooks.js';
5
+ export * as userModeProps from './arbor/props.js';
5
6
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAE3B,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@a-type/ui",
3
- "version": "6.0.65",
3
+ "version": "6.0.67",
4
4
  "type": "module",
5
5
  "repository": {
6
6
  "url": "https://github.com/a-type/ui"
@@ -41,8 +41,8 @@
41
41
  },
42
42
  "dependencies": {
43
43
  "@a-type/utils": "^1.1.9",
44
- "@arbor-css/core": "^0.0.136",
45
- "@arbor-css/postcss": "^0.0.136",
44
+ "@arbor-css/core": "^0.0.139",
45
+ "@arbor-css/postcss": "^0.0.139",
46
46
  "@base-ui/react": "^1.4.1",
47
47
  "@use-gesture/react": "^10.3.1",
48
48
  "browser-image-resizer": "^2.4.1",
package/src/arbor/arbor.ts CHANGED
@@ -50,6 +50,8 @@ export type ATypeConfig<
50
50
  TColors extends DefaultColorRangeName = DefaultColorRangeName,
51
51
  > = Partial<ArborPresetConfig<TColors>> & {
52
52
  mainColor?: TColors;
53
+ defaultAccentColor?: TColors;
54
+ fallbackAccentColor?: TColors;
53
55
  roundActions?: boolean;
54
56
  roundControls?: boolean;
55
57
  };
@@ -57,6 +59,8 @@ export type ATypeConfig<
57
59
  export function presetAtype<
58
60
  TColors extends DefaultColorRangeName = DefaultColorRangeName,
59
61
  >(config?: ATypeConfig<TColors>) {
62
+ const defaultAccent = config?.defaultAccentColor || 'leek';
63
+ const fallbackAccent = config?.fallbackAccentColor || 'lemon';
60
64
  const base = presetArbor({
61
65
  ...config,
62
66
  color: {
@@ -199,7 +203,7 @@ export function presetAtype<
199
203
  extends: [base],
200
204
  baseMode: ($) => ({
201
205
  color: {
202
- accent: $.mode.color.palette.leek,
206
+ accent: $.mode.color.palette[defaultAccent],
203
207
  },
204
208
  action: {
205
209
  roundness: config?.roundActions === false ? undefined : 2,
@@ -407,8 +411,9 @@ export function presetAtype<
407
411
  color: {
408
412
  main: preset.$.mode.color.palette[colorName],
409
413
  // avoid assigning leek to both main and accent
410
- accent:
411
- colorName === 'leek' ? preset.$.mode.color.palette.lemon : undefined,
414
+ accent: (colorName === defaultAccent
415
+ ? preset.$.mode.color.palette[fallbackAccent]
416
+ : preset.$.mode.color.palette[defaultAccent]) as any,
412
417
  },
413
418
  });
414
419
  }
package/src/components/provider/Provider.tsx CHANGED
@@ -38,7 +38,7 @@ export function Provider({
38
38
  ? virtualKeyboardBehavior
39
39
  : 'displace';
40
40
  useVirtualKeyboardBehavior(supportedVirtualKeyboardBehavior);
41
- useThemedTitleBar('gray', 'wash', undefined, disableTitleBarColor);
41
+ useThemedTitleBar('--m-color-main-paper', disableTitleBarColor);
42
42
  const otherStuff = (
43
43
  <>
44
44
  <IconSpritesheet />
package/src/hooks/useTitleBarColor.stories.tsx CHANGED
@@ -98,6 +98,6 @@ function MockTitleBar() {
98
98
  }
99
99
 
100
100
  function Overrider() {
101
- useThemedTitleBar('primary', 'dark');
101
+ useThemedTitleBar('--m-color-accent-light');
102
102
  return null;
103
103
  }
package/src/hooks/useTitleBarColor.ts CHANGED
@@ -1,4 +1,5 @@
1
- import { useCallback } from 'react';
1
+ import { useCallback, useEffect, useSyncExternalStore } from 'react';
2
+ import { useResolvedColorMode } from '../colorMode.js';
2
3
 
3
4
  let defaultColor = '#ffffff';
4
5
  function getCurrentColor() {
@@ -33,7 +34,23 @@ function changeThemeColor(color: string) {
33
34
  export function useTitleBarColor(
34
35
  color: string | { light: string; dark: string },
35
36
  ) {
36
- /* TODO: rewrite this */
37
+ const colorMode = useResolvedColorMode();
38
+ useEffect(() => {
39
+ const finalColor =
40
+ typeof color === 'string'
41
+ ? color
42
+ : colorMode === 'dark'
43
+ ? color.dark
44
+ : color.light;
45
+ const previousColor =
46
+ document
47
+ .querySelector('meta[name=theme-color]')
48
+ ?.getAttribute('content') ?? defaultColor;
49
+ changeThemeColor(finalColor);
50
+ return () => {
51
+ changeThemeColor(previousColor);
52
+ };
53
+ }, [color, colorMode]);
37
54
  }
38
55
 
39
56
  export function useSetTitleBarColor() {
@@ -42,12 +59,58 @@ export function useSetTitleBarColor() {
42
59
  return { setColor, resetColor };
43
60
  }
44
61
 
45
- export function useThemedTitleBar(
46
- paletteOrName: any,
47
- value: any,
48
- /** If not provided, will inherit from app */
49
- mode?: 'light' | 'dark',
50
- skip?: boolean,
51
- ) {
52
- /* TODO: rewrite this */
62
+ export function useThemedTitleBar(colorToken: string, skip?: boolean) {
63
+ const { setColor } = useSetTitleBarColor();
64
+ // using a variable to rerun the effect instead of subscribing in-effect...
65
+ // this is an attempt to preserve the cascading behavior in the React tree
66
+ // if a child calls this hook, so ideally the parent and child should both
67
+ // re-evaluate but the child should 'win'
68
+ const visible = useSyncExternalStore(
69
+ (onStoreChange) => {
70
+ document.addEventListener('visibilitychange', onStoreChange);
71
+ return () => {
72
+ document.removeEventListener('visibilitychange', onStoreChange);
73
+ };
74
+ },
75
+ () => document.visibilityState === 'visible',
76
+ () => true,
77
+ );
78
+
79
+ const mode = useResolvedColorMode();
80
+
81
+ useEffect(() => {
82
+ if (skip) return;
83
+ const previousColor = getCurrentColor();
84
+
85
+ async function update() {
86
+ try {
87
+ const { resolveRuntimeValue } = await import('@arbor-css/core/runtime');
88
+ const color = await resolveRuntimeValue(colorToken, {
89
+ tokenPurpose: 'color',
90
+ });
91
+ if (color) {
92
+ setColor(extractLightDark(color, mode));
93
+ }
94
+ } catch (e) {
95
+ console.error('Error updating title bar color:', e);
96
+ }
97
+ }
98
+ update();
99
+
100
+ if (previousColor) {
101
+ return () => {
102
+ setColor(previousColor);
103
+ };
104
+ }
105
+ }, [setColor, colorToken, skip, visible, mode]);
106
+ }
107
+
108
+ function extractLightDark(colorValue: string, mode: string): string {
109
+ if (colorValue.startsWith('light-dark(')) {
110
+ const colors = colorValue.slice(11, -1).split(',');
111
+ if (colors.length === 2) {
112
+ return mode === 'light' ? colors[0].trim() : colors[1].trim();
113
+ }
114
+ }
115
+ return colorValue;
53
116
  }
package/src/index.ts CHANGED
@@ -3,3 +3,5 @@ export { clsx } from 'clsx';
3
3
  export * from './colorMode.js';
4
4
  export * from './components/index.js';
5
5
  export * from './hooks.js';
6
+
7
+ export * as userModeProps from './arbor/props.js';