@a-type/ui 2.4.1 → 2.6.0

package/dist/esm/{uno.preset.js → uno/uno.preset.js}

@@ -11,10 +11,10 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { entriesToCss, toArray } from '@unocss/core';
-import { bgColors as bgColorsRules } from '@unocss/preset-mini/rules';
+import { parseColor } from '@unocss/preset-mini/utils';
 import presetWind3 from '@unocss/preset-wind3';
-import { darken, dynamicComputedVars, dynamicTheme, dynamicThemeComputedColors, lighten, themeColors, } from './uno/colors.js';
-const baseBgRule = bgColorsRules[0];
+import { darken, dynamicComputedVars, dynamicTheme, dynamicThemeComputedColors, lighten, themeColors, } from './colors.js';
+import { getShadows } from './shadows.js';
 const spacing = {
     sm: 0.125,
     md: 0.25,
@@ -25,7 +25,7 @@ const roundedScaling = {
     md: 1,
     lg: 1.25,
 };
-export default function presetAtype({ scale = 'md', interFontLocation = 'https://resources.biscuits.club/fonts/Inter-VariableFont_slnt,wght.ttf', domineFontLocation = 'https://resources.biscuits.club/fonts/Domine-VariableFont_wght.ttf', customTheme, borderScale = 1, roundedness = 1, cornerScale = roundedness, spacingScale = 1, saturation = 40, noPreflight, noZIndexes = false, } = {}) {
+export default function presetAtype({ scale = 'md', interFontLocation = 'https://resources.biscuits.club/fonts/Inter-VariableFont_slnt,wght.ttf', domineFontLocation = 'https://resources.biscuits.club/fonts/Domine-VariableFont_wght.ttf', customTheme, borderScale = 1, roundedness = 1, cornerScale = roundedness, spacingScale = 1, saturation = 40, noPreflight, noZIndexes = false, hardShadows = false, } = {}) {
     const saturationScale = saturation / 100;
     const spacingIncrement = spacing[scale];
     cornerScale *= roundedScaling[scale];
@@ -83,23 +83,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 'min-content': 'min-content',
                 'max-content': 'max-content',
             },
-            boxShadow: {
-                sm: '0 1px 2px 0 var(--color-shadow-2), 0 0 1px 0 var(--color-shadow-2)',
-                'sm-inset': 'inset 0 1px 2px 0 var(--color-shadow-2), inset 0 0 1px 0 var(--color-shadow-2)',
-                md: '0 4px 6px -1px var(--color-shadow-1), 0 2px 4px -1px var(--color-shadow-2)',
-                'md-inset': 'inset 0 4px 6px -1px var(--color-shadow-1), inset 0 2px 4px -1px var(--color-shadow-2)',
-                lg: '0 8px 14px -3px var(--color-shadow-1), 0 2px 10px 0px var(--color-shadow-2)',
-                'lg-inset': 'inset 0 8px 15px -3px var(--color-shadow-1), inset 0 2px 6px -2px var(--color-shadow-2)',
-                xl: '0 20px 25px -5px var(--color-shadow-1), 0 10px 10px -5px var(--color-shadow-2)',
-                'xl-inset': 'inset 0 20px 25px -5px var(--color-shadow-1), inset 0 10px 10px -5px var(--color-shadow-2)',
-                'sm-up': '0 -1px 2px 0 var(--color-shadow-2), 0 0 1px 0 var(--color-shadow-2)',
-                'md-up': '0 -4px 6px -1px var(--color-shadow-1), 0 -2px 4px -1px var(--color-shadow-2)',
-                'lg-up': '0 -10px 15px -3px var(--color-shadow-1), 0 -4px 6px -2px var(--color-shadow-2)',
-                'xl-up': '0 -20px 25px -5px var(--color-shadow-1), 0 -10px 10px -5px var(--color-shadow-2)',
-                'lg-dim': '0 0 0 3000px var(--color-overlay-dark), 0 10px 15px 3px var(--color-shadow-1), 0 4px 6px -2px var(--color-shadow-2)',
-                // focus outlines
-                focus: `0 0 0 3px var(--color-primary-light)`,
-            },
+            boxShadow: getShadows(hardShadows),
             easing: {
                 springy: 'cubic-bezier(0.64, -0.25, 0.1, 1.4)',
                 default: 'ease',
@@ -319,34 +303,22 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 /^gutter-bottom$/,
                 (_, { theme }) => ({ 'margin-bottom': theme.spacing[2] }),
             ],
-            ['shadow-1', { 'box-shadow': '0 1px 2px 0 var(--color-shadow-2)' }],
-            [
-                'shadow-2',
-                {
-                    'box-shadow': '0 4px 6px -1px var(--color-shadow-1), 0 2px 4px -1px var(--color-shadow-2)',
-                },
-            ],
-            [
-                'shadow-3',
-                {
-                    'box-shadow': '0 10px 15px -3px var(--color-shadow-1), 0 4px 6px -2px var(--color-shadow-2)',
-                },
-            ],
-            [
-                'shadow-4',
-                {
-                    'box-shadow': '0 20px 25px -5px var(--color-shadow-1), 0 10px 10px -5px var(--color-shadow-2)',
-                },
-            ],
             [
                 /^color-(.*)$/,
                 (match, { theme }) => {
                     if (match[1] === 'inherit') {
                         return { color: 'var(--v-color-altered,var(--v-color))' };
                     }
+                    const parsed = parseColor(match[1], theme);
+                    if (!(parsed === null || parsed === void 0 ? void 0 : parsed.color)) {
+                        return undefined;
+                    }
                     return {
-                        color: 'var(--v-color-altered,var(--v-color))',
-                        '--v-color': resolveThemeColor(match[1], theme),
+                        color: parsed.opacity
+                            ? 'rgb(from var(--v-color-altered,var(--v-color)) r g b / var(--v-color-opacity,100%))'
+                            : 'var(--v-color-altered,var(--v-color))',
+                        '--v-color': parsed.color,
+                        '--v-color-opacity': (parsed.opacity || 100) + '%',
                     };
                 },
             ],
@@ -367,15 +339,20 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 (match, ctx) => {
                     const { theme } = ctx;
                     if (match[1] === 'inherit') {
-                        return { 'background-color': 'var(--v-bg-altered,var(--v-bg))' };
+                        return {
+                            'background-color': 'rgb(from var(--v-bg-altered,var(--v-bg)) r g b / var(--v-bg-opacity,100%))',
+                        };
                     }
-                    const resolvedColor = resolveThemeColor(match[1], theme);
-                    if (resolvedColor === null) {
-                        return baseBgRule[1](match, ctx);
+                    const parsed = parseColor(match[1], theme);
+                    if (!(parsed === null || parsed === void 0 ? void 0 : parsed.color)) {
+                        return undefined;
                     }
                     return {
-                        'background-color': 'var(--v-bg-altered,var(--v-bg))',
-                        ['--v-bg']: resolvedColor,
+                        'background-color': parsed.opacity
+                            ? 'rgb(from var(--v-bg-altered,var(--v-bg)) r g b / var(--v-bg-opacity,100%))'
+                            : 'var(--v-bg-altered,var(--v-bg))',
+                        ['--v-bg']: parsed.color,
+                        ['--v-bg-opacity']: (parsed.opacity || 100) + '%',
                     };
                 },
                 {
@@ -395,43 +372,82 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 }),
             ],
             [
-                /^border-color-(.*)$/,
-                (match, { theme }) => ({
-                    'border-color': 'var(--v-border-altered,var(--v-border))',
-                    '--v-border': resolveThemeColor(match[1], theme),
-                }),
+                /^border-(.*)$/,
+                (match, { theme }) => {
+                    if (match[1] === 'none') {
+                        return undefined;
+                    }
+                    const parsed = parseColor(match[1], theme);
+                    if (!(parsed === null || parsed === void 0 ? void 0 : parsed.color)) {
+                        return undefined;
+                    }
+                    return {
+                        'border-color': parsed.opacity
+                            ? 'rgb(from var(--v-border-altered,var(--v-border)) r g b / var(--v-border-opacity,100%))'
+                            : 'var(--v-border-altered,var(--v-border))',
+                        '--v-border': parsed.color,
+                        '--v-border-opacity': (parsed.opacity || 100) + '%',
+                    };
+                },
             ],
             [
-                /^border-color-lighten-(\d+\.?\d*)$/,
+                /^border-lighten-(\d+\.?\d*)$/,
                 (match, { theme }) => ({
                     '--v-border-altered': lighten('var(--v-border,currentColor)', match[1]),
                 }),
+                {
+                    autocomplete: 'border-lighten-<number>',
+                },
             ],
             [
-                /^border-color-darken-(\d+\.?\d*)$/,
+                /^border-darken-(\d+\.?\d*)$/,
                 (match, { theme }) => ({
                     '--v-border-altered': darken('var(--v-border,currentColor)', match[1]),
                 }),
+                {
+                    autocomplete: 'border-darken-<number>',
+                },
             ],
             [
-                /^ring-color-(.*)$/,
-                (match, { theme }) => ({
-                    '--un-ring-color': 'var(--v-ring-altered,var(--v-ring))',
-                    '--v-ring': resolveThemeColor(match[1], theme),
-                }),
+                /^ring-(.*)$/,
+                (match, { theme }) => {
+                    const parsed = parseColor(match[1], theme);
+                    if (!(parsed === null || parsed === void 0 ? void 0 : parsed.color)) {
+                        return undefined;
+                    }
+                    return {
+                        '--un-ring-color': parsed.opacity
+                            ? 'rgb(from var(--v-ring-altered,var(--v-ring)) r g b / var(--v-ring-opacity,100%))'
+                            : 'var(--v-ring-altered,var(--v-ring))',
+                        '--v-ring': parsed.color,
+                        '--v-ring-opacity': (parsed.opacity || 100) + '%',
+                    };
+                },
             ],
             [
-                /^ring-color-lighten-(\d+\.?\d*)$/,
+                /^ring-lighten-(\d+\.?\d*)$/,
                 (match, { theme }) => ({
                     '--v-ring-altered': lighten('var(--v-ring,currentColor)', match[1]),
                 }),
             ],
             [
-                /^ring-color-darken-(\d+\.?\d*)$/,
+                /^ring-darken-(\d+\.?\d*)$/,
                 (match, { theme }) => ({
                     '--v-ring-altered': darken('var(--v-ring,currentColor)', match[1]),
                 }),
             ],
+            [
+                /^shadow-up$/,
+                () => ({
+                    '--v-shadow-y-mult': '-1',
+                }),
+            ],
+            [
+                /^shadow-down$/,
+                () => ({
+                    '--v-shadow-y-mult': '1',
+                }),
+            ],
             [
                 /^anchor-(\w+)$/,
                 (match) => ({
@@ -454,7 +470,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 'overflow-stable',
                 {
                     'scrollbar-gutter': 'stable',
-                    'scrollbar-color': 'var(--v-color-altered,var(--v-color,var(--color-gray))) transparent',
+                    'scrollbar-color': 'hsl(from var(--v-color-altered,var(--v-color,var(--color-black))) h calc(s * 0.2) calc(l * 4)) transparent',
                 },
             ],
             [
@@ -462,7 +478,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 {
                     overflow: 'auto',
                     'scrollbar-gutter': 'stable',
-                    'scrollbar-color': 'var(--v-color-altered,var(--v-color,var(--color-gray))) transparent',
+                    'scrollbar-color': 'hsl(from var(--v-color-altered,var(--v-color,var(--color-black))) h calc(s * 0.2) calc(l * 4)) transparent',
                 },
             ],
             [
@@ -470,7 +486,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 {
                     'overflow-y': 'auto',
                     'scrollbar-gutter': 'stable',
-                    'scrollbar-color': 'var(--v-color-altered,var(--v-color,var(--color-gray))) transparent',
+                    'scrollbar-color': 'hsl(from var(--v-color-altered,var(--v-color,var(--color-black))) h calc(s * 0.2) calc(l * 4)) transparent',
                 },
             ],
             [
@@ -478,7 +494,30 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 {
                     'overflow-x': 'auto',
                     'scrollbar-gutter': 'stable',
-                    'scrollbar-color': 'var(--v-color-altered,var(--v-color,var(--color-gray))) transparent',
+                    'scrollbar-color': 'hsl(from var(--v-color-altered,var(--v-color,var(--color-black))) h calc(s * 0.2) calc(l * 4)) transparent',
+                },
+            ],
+            [
+                /^arrow$/,
+                function* (_, ctx) {
+                    yield {
+                        fill: 'var(--v-bg-altered,var(--v-bg))',
+                        stroke: 'var(--v-border-altered,var(--v-border))',
+                        width: 'var(--arrow-size)',
+                        height: 'calc(var(--arrow-size) * 0.5)',
+                        position: 'relative',
+                        'z-index': 0,
+                    };
+                    yield {
+                        [ctx.symbols.selector]: (selector) => `span:has(${selector}):after`,
+                        content: '""',
+                        position: 'absolute',
+                        top: '0',
+                        left: '1.5px',
+                        right: '1.5px',
+                        height: '1px',
+                        background: 'var(--v-bg-altered,var(--v-bg))',
+                    };
                 },
             ],
         ],
@@ -493,7 +532,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
                 };
             },
         ],
-        shortcuts: Object.assign({ border: 'border-width-thin border-solid', 'border-default': 'border border-solid border-color-black', 'border-light': 'border border-solid border-color-gray border-color-darken-3', 'flex-1-0-0': 'flex-grow-1 flex-shrink-0 flex-basis-0', 'flex-0-0-auto': 'flex-grow-0 flex-shrink-0 flex-basis-auto', row: 'layer-components:flex layer-components:flex-row layer-components:gap-sm layer-components:items-center', col: 'layer-components:flex layer-components:flex-col layer-components:gap-sm layer-components:items-center', 'hidden-input': 'op-0 absolute z--1 pointer-events-none [&::webkit-file-upload-button]:hidden', center: 'left-1/2 top-1/2 translate-x--1/2 translate-y--1/2', 'center-x': 'left-1/2 translate-x--1/2', 'center-y': 'top-1/2 translate-y--1/2', 'outline-off': '[outline:none]', 'bg-wash': 'bg-[var(--color-wash)]', unset: '[all:unset]', 'bottom-keyboard': 'bottom-[var(--mock-virtual-keyboard-height,env(keyboard-inset-height,0px))]' }, (noZIndexes
+        shortcuts: Object.assign({ border: 'border-width-thin border-solid', 'border-default': 'border border-solid border-black', 'border-light': 'border border-solid border-gray border-darken-3', 'flex-1-0-0': 'flex-grow-1 flex-shrink-0 flex-basis-0', 'flex-0-0-auto': 'flex-grow-0 flex-shrink-0 flex-basis-auto', row: 'layer-components:flex layer-components:flex-row layer-components:gap-sm layer-components:items-center', col: 'layer-components:flex layer-components:flex-col layer-components:gap-sm layer-components:items-center', 'hidden-input': 'op-0 absolute z--1 pointer-events-none [&::webkit-file-upload-button]:hidden', center: 'left-1/2 top-1/2 translate-x--1/2 translate-y--1/2', 'center-x': 'left-1/2 translate-x--1/2', 'center-y': 'top-1/2 translate-y--1/2', 'outline-off': '[outline:none]', 'bg-wash': 'bg-[var(--color-wash)]', unset: '[all:unset]', 'bottom-keyboard': 'bottom-[var(--mock-virtual-keyboard-height,env(keyboard-inset-height,0px))]' }, (noZIndexes
             ? {}
             : {
                 'z-nav': 'z-[var(--z-nav)]',
@@ -672,6 +711,7 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
 					--global-corner-scale: ${cornerScale};
 					--global-border-scale: ${borderScale};
 					--global-spacing-scale: ${spacingScale};
+					--global-shadow-spread: ${hardShadows ? 0 : 1};
 
 					--font-sans: "Inter", sans-serif;
 					--font-serif: "Domine", serif;
@@ -689,6 +729,11 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
 					--z-dialogBackdrop: 900;
 					--z-tooltip: 10000;
 					--z-overdraw: 100000;
+
+					--un-shadow-color: var(--palette-true-black);
+					--un-shadow-opacity: 10%;
+
+					--arrow-size: 1rem;
 				}
 
 				@layer preflightBase {
@@ -835,6 +880,36 @@ export default function presetAtype({ scale = 'md', interFontLocation = 'https:/
 					syntax: "*";
 					inherits: false;
 				}
+
+				@property --v-shadow-y-mult {
+					syntax: "*";
+					inherits: false;
+				}
+
+				@property --v-ring-altered {
+					syntax: "*";
+					inherits: false;
+				}
+
+				@property --v-bg-opacity {
+					syntax: "<percentage>";
+					inherits: false;
+				}
+
+				@property --v-color-opacity {
+					syntax: "<percentage>";
+					inherits: false;
+				}
+
+				@property --v-border-opacity {
+					syntax: "<percentage>";
+					inherits: false;
+				}
+
+				@property --v-ring-opacity {
+					syntax: "<percentage>";
+					inherits: false;
+				}
 			`;
                 },
             },
@@ -861,15 +936,6 @@ function resolveThemeColor(color, theme) {
         color.endsWith(']')) {
         return color.slice(1, -1);
     }
-    if (color === 'bg') {
-        return 'var(--v-bg-altered, var(--v-bg))';
-    }
-    else if (color === 'fg' || color === 'color') {
-        return 'var(--v-color-altered, var(--v-color))';
-    }
-    else if (color === 'border') {
-        return 'var(--v-border-altered, var(--v-border))';
-    }
     const parts = color.split('-');
     let resolveFrom = theme.colors;
     let resolvedColor = color;

package/dist/esm/uno/uno.preset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uno.preset.js","sourceRoot":"","sources":["../../../src/uno/uno.preset.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EACN,MAAM,EACN,mBAAmB,EACnB,YAAY,EAEZ,0BAA0B,EAC1B,OAAO,EACP,WAAW,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,OAAO,GAAG;IACf,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,OAAO;CACX,CAAC;AACF,MAAM,cAAc,GAAG;IACtB,EAAE,EAAE,CAAC;IACL,EAAE,EAAE,CAAC;IACL,EAAE,EAAE,IAAI;CACR,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EACnC,KAAK,GAAG,IAAI,EACZ,iBAAiB,GAAG,wEAAwE,EAC5F,kBAAkB,GAAG,oEAAoE,EACzF,WAAW,EACX,WAAW,GAAG,CAAC,EACf,WAAW,GAAG,CAAC,EACf,WAAW,GAAG,WAAW,EACzB,YAAY,GAAG,CAAC,EAChB,UAAU,GAAG,EAAE,EACf,WAAW,EACX,UAAU,GAAG,KAAK,EAClB,WAAW,GAAG,KAAK,MAehB,EAAE;IACL,MAAM,eAAe,GAAG,UAAU,GAAG,GAAG,CAAC;IACzC,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,WAAW,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;IAErC,MAAM,uBAAuB,GAAG,CAAC,CAAC;IAClC,MAAM,wBAAwB,GAAG,CAAC,CAAC;IAEnC,OAAO;QACN,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,MAAM;QACf,KAAK,EAAE;YACN,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE;gBACX,OAAO,EAAE,iCAAiC;gBAC1C,IAAI,EAAE,8BAA8B;gBACpC,KAAK,EAAE,0BAA0B;gBACjC,KAAK,EAAE,wCAAwC;aAC/C;YACD,QAAQ,EAAE;gBACT,GAAG,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;gBAC5B,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;gBACvB,EAAE,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;gBACvB,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;gBAC1B,EAAE,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;gBAC1B,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;gBACtB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;gBAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACzB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;gBACzB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACzB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACzB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACzB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACzB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;aACzB;YACD,OAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC;YACtC,YAAY,EAAE;gBACb,EAAE,EAAE,4EAA4E;gBAChF,EAAE,EAAE,2EAA2E;gBAC/E,EAAE,EAAE,yEAAyE;gBAC7E,EAAE,EAAE,4EAA4E;gBAChF,EAAE,EAAE,2EAA2E;gBAC/E,IAAI,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;aAC1C;YACD,SAAS,EAAE;gBACV,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE,0CAA0C;gBAChD,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,0CAA0C;aACjD;YACD,KAAK,EAAE;gBACN,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,MAAM;gBACZ,aAAa,EAAE,aAAa;gBAC5B,aAAa,EAAE,aAAa;aAC5B;YACD,MAAM,EAAE;gBACP,aAAa,EAAE,aAAa;gBAC5B,aAAa,EAAE,aAAa;aAC5B;YACD,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC;YAClC,MAAM,EAAE;gBACP,OAAO,EAAE,qCAAqC;gBAC9C,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,QAAQ;aAChB;YACD,SAAS,EAAE;gBACV,SAAS,EAAE;oBACV,cAAc,EAAE,yCAAyC;oBACzD,QAAQ,EAAE,uHAAuH;oBACjI,6BAA6B;oBAC7B,gBAAgB,EAAE;;;;MAIjB;oBACD,gBAAgB,EAAE;;;MAGjB;oBACD,GAAG,EAAE;;;;;;;;;;;;;MAaJ;oBACD,WAAW,EAAE;;;;;MAKZ;oBACD,kBAAkB,EAAE;;;MAGnB;oBACD,iCAAiC,EAAE;;;YAG5B;oBACP,kCAAkC,EAAE;;;YAG7B;oBACP,mCAAmC,EAAE;;;YAG9B;oBACP,oCAAoC,EAAE;;;YAG/B;oBACP,6BAA6B,EAAE;;;OAG7B;oBACF,8BAA8B,EAAE;;;OAG9B;oBACF,YAAY,EAAE;;;OAGZ;oBACF,WAAW,EAAE;;;OAGX;oBACF,QAAQ,EAAE;;;OAGR;oBACF,gBAAgB,EAAE;;;;OAIhB;oBACF,cAAc,EAAE;;;;;;;OAOd;oBACF,cAAc,EAAE;;;OAGd;oBACF,cAAc,EAAE;;;OAGd;oBACF,gBAAgB,EAAE;;;OAGhB;oBACF,eAAe,EAAE;;;OAGf;oBACF,eAAe,EAAE;;;OAGf;oBACF,eAAe,EAAE;;;OAGf;oBACF,iBAAiB,EAAE;;;OAGjB;oBACF,gBAAgB,EAAE;;;OAGhB;oBACF,YAAY,EAAE;;;OAGZ;oBACF,aAAa,EAAE;;;OAGb;oBACF,WAAW,EAAE;;;OAGX;oBACF,YAAY,EAAE;;;OAGZ;oBACF,eAAe,EAAE;;;OAGf;iBACF;gBACD,SAAS,EAAE;oBACV,MAAM,EAAE,QAAQ;oBAChB,OAAO,EAAE,qCAAqC;oBAC9C,QAAQ,EAAE,qCAAqC;oBAC/C,UAAU,EAAE,UAAU;oBACtB,YAAY,EAAE,qCAAqC;oBACnD,cAAc,EAAE,qCAAqC;oBACrD,cAAc,EAAE,qCAAqC;oBACrD,eAAe,EAAE,qCAAqC;oBACtD,aAAa,EAAE,qCAAqC;oBACpD,eAAe,EAAE,qCAAqC;oBACtD,eAAe,EAAE,qCAAqC;oBACtD,gBAAgB,EAAE,qCAAqC;oBACvD,gBAAgB,EAAE,qCAAqC;oBACvD,kBAAkB,EAAE,qCAAqC;oBACzD,kBAAkB,EAAE,qCAAqC;oBACzD,mBAAmB,EAAE,qCAAqC;oBAC1D,SAAS,EAAE,qCAAqC;oBAChD,UAAU,EAAE,qCAAqC;oBACjD,WAAW,EAAE,QAAQ;oBACrB,iCAAiC,EAChC,qCAAqC;oBACtC,kCAAkC,EACjC,qCAAqC;oBACtC,mCAAmC,EAClC,qCAAqC;oBACtC,oCAAoC,EACnC,qCAAqC;oBACtC,6BAA6B,EAAE,qCAAqC;oBACpE,8BAA8B,EAAE,qCAAqC;oBACrE,gBAAgB,EAAE,qCAAqC;oBACvD,WAAW,EAAE,qCAAqC;oBAClD,YAAY,EAAE,qCAAqC;oBACnD,eAAe,EAAE,qCAAqC;iBACtD;gBACD,SAAS,EAAE;oBACV,YAAY,EAAE,OAAO;oBACrB,cAAc,EAAE,OAAO;oBACvB,cAAc,EAAE,OAAO;oBACvB,eAAe,EAAE,OAAO;oBACxB,aAAa,EAAE,OAAO;oBACtB,eAAe,EAAE,OAAO;oBACxB,eAAe,EAAE,OAAO;oBACxB,gBAAgB,EAAE,OAAO;oBACzB,gBAAgB,EAAE,OAAO;oBACzB,kBAAkB,EAAE,OAAO;oBAC3B,mBAAmB,EAAE,OAAO;oBAC5B,kBAAkB,EAAE,OAAO;oBAC3B,mBAAmB,EAAE,OAAO;oBAC5B,SAAS,EAAE,OAAO;oBAClB,UAAU,EAAE,OAAO;oBACnB,WAAW,EAAE,MAAM;oBACnB,iCAAiC,EAAE,OAAO;oBAC1C,kCAAkC,EAAE,OAAO;oBAC3C,mCAAmC,EAAE,OAAO;oBAC5C,oCAAoC,EAAE,OAAO;oBAC7C,6BAA6B,EAAE,OAAO;oBACtC,8BAA8B,EAAE,OAAO;oBACvC,gBAAgB,EAAE,OAAO;oBACzB,YAAY,EAAE,OAAO;oBACrB,aAAa,EAAE,OAAO;oBACtB,WAAW,EAAE,OAAO;oBACpB,YAAY,EAAE,OAAO;oBACrB,eAAe,EAAE,QAAQ;oBACzB,QAAQ,EAAE,OAAO;iBACjB;aACD;SACD;QACD,WAAW,EAAE,CAAC,KAAU,EAAE,EAAE;YAC3B,6DAA6D;YAC7D,MAAM,EAAE,MAAM,EAAE,CAAC,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA9B,UAAsB,CAAQ,CAAC;YACrC,uBACC,MAAM,EAAE,WAAW,IAChB,IAAI,EACN;QACH,CAAC;QAED,KAAK,EAAE;YACN;gBACC,iBAAiB;gBACjB,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,eAAe,EAAG,KAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;aAClE;YACD;gBACC,cAAc;gBACd,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;oBACpB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC5B,OAAO,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAC;oBAC3D,CAAC;oBACD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC3C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC;oBAClB,CAAC;oBACD,OAAO;wBACN,KAAK,EAAE,MAAM,CAAC,OAAO;4BACpB,CAAC,CAAC,qFAAqF;4BACvF,CAAC,CAAC,uCAAuC;wBAC1C,WAAW,EAAE,MAAM,CAAC,KAAK;wBACzB,mBAAmB,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,GAAG;qBAClD,CAAC;gBACH,CAAC;aACD;YACD;gBACC,6BAA6B;gBAC7B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,mBAAmB,EAAE,OAAO,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACrE,CAAC;aACF;YACD;gBACC,4BAA4B;gBAC5B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,mBAAmB,EAAE,MAAM,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACpE,CAAC;aACF;YACD;gBACC,WAAW;gBACX,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBACd,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;oBACtB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC5B,OAAO;4BACN,kBAAkB,EACjB,4EAA4E;yBAC7E,CAAC;oBACH,CAAC;oBACD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC3C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC;oBAClB,CAAC;oBAED,OAAO;wBACN,kBAAkB,EAAE,MAAM,CAAC,OAAO;4BACjC,CAAC,CAAC,4EAA4E;4BAC9E,CAAC,CAAC,iCAAiC;wBACpC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK;wBACxB,CAAC,gBAAgB,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,GAAG;qBACjD,CAAC;gBACH,CAAC;gBACD;oBACC,YAAY,EAAE,YAAY;iBAC1B;aACD;YACD;gBACC,0BAA0B;gBAC1B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,gBAAgB,EAAE,OAAO,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACrE,CAAC;aACF;YACD;gBACC,yBAAyB;gBACzB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,gBAAgB,EAAE,MAAM,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACpE,CAAC;aACF;YACD;gBACC,eAAe;gBACf,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;oBACpB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;wBACzB,OAAO,SAAS,CAAC;oBAClB,CAAC;oBACD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC3C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC;oBAClB,CAAC;oBACD,OAAO;wBACN,cAAc,EAAE,MAAM,CAAC,OAAO;4BAC7B,CAAC,CAAC,wFAAwF;4BAC1F,CAAC,CAAC,yCAAyC;wBAC5C,YAAY,EAAE,MAAM,CAAC,KAAK;wBAC1B,oBAAoB,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,GAAG;qBACnD,CAAC;gBACH,CAAC;aACD;YACD;gBACC,8BAA8B;gBAC9B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,oBAAoB,EAAE,OAAO,CAC5B,8BAA8B,EAC9B,KAAK,CAAC,CAAC,CAAC,CACR;iBACD,CAAC;gBACF;oBACC,YAAY,EAAE,yBAAyB;iBACvC;aACD;YACD;gBACC,6BAA6B;gBAC7B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,oBAAoB,EAAE,MAAM,CAC3B,8BAA8B,EAC9B,KAAK,CAAC,CAAC,CAAC,CACR;iBACD,CAAC;gBACF;oBACC,YAAY,EAAE,wBAAwB;iBACtC;aACD;YACD;gBACC,aAAa;gBACb,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;oBACpB,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC3C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC;oBAClB,CAAC;oBACD,OAAO;wBACN,iBAAiB,EAAE,MAAM,CAAC,OAAO;4BAChC,CAAC,CAAC,kFAAkF;4BACpF,CAAC,CAAC,qCAAqC;wBACxC,UAAU,EAAE,MAAM,CAAC,KAAK;wBACxB,kBAAkB,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,GAAG;qBACjD,CAAC;gBACH,CAAC;aACD;YACD;gBACC,4BAA4B;gBAC5B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,kBAAkB,EAAE,OAAO,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACnE,CAAC;aACF;YACD;gBACC,2BAA2B;gBAC3B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtB,kBAAkB,EAAE,MAAM,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBAClE,CAAC;aACF;YACD;gBACC,aAAa;gBACb,GAAG,EAAE,CAAC,CAAC;oBACN,mBAAmB,EAAE,IAAI;iBACzB,CAAC;aACF;YACD;gBACC,eAAe;gBACf,GAAG,EAAE,CAAC,CAAC;oBACN,mBAAmB,EAAE,GAAG;iBACxB,CAAC;aACF;YACD;gBACC,gBAAgB;gBAChB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACX,aAAa,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;iBAC9B,CAAC;gBACF;oBACC,YAAY,EAAE,eAAe;iBAC7B;aACD;YACD;gBACC,mBAAmB;gBACnB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACX,iBAAiB,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;iBAClC,CAAC;gBACF;oBACC,YAAY,EAAE,kBAAkB;iBAChC;aACD;YACD;gBACC,iBAAiB;gBACjB;oBACC,kBAAkB,EAAE,QAAQ;oBAC5B,iBAAiB,EAChB,4GAA4G;iBAC7G;aACD;YACD;gBACC,eAAe;gBACf;oBACC,QAAQ,EAAE,MAAM;oBAChB,kBAAkB,EAAE,QAAQ;oBAC5B,iBAAiB,EAChB,4GAA4G;iBAC7G;aACD;YACD;gBACC,iBAAiB;gBACjB;oBACC,YAAY,EAAE,MAAM;oBACpB,kBAAkB,EAAE,QAAQ;oBAC5B,iBAAiB,EAChB,4GAA4G;iBAC7G;aACD;YACD;gBACC,iBAAiB;gBACjB;oBACC,YAAY,EAAE,MAAM;oBACpB,kBAAkB,EAAE,QAAQ;oBAC5B,iBAAiB,EAChB,4GAA4G;iBAC7G;aACD;YACD;gBACC,SAAS;gBACT,QAAQ,CAAC,EAAE,CAAC,EAAE,GAAG;oBAChB,MAAM;wBACL,IAAI,EAAE,iCAAiC;wBACvC,MAAM,EAAE,yCAAyC;wBACjD,KAAK,EAAE,mBAAmB;wBAC1B,MAAM,EAAE,+BAA+B;wBACvC,QAAQ,EAAE,UAAU;wBACpB,SAAS,EAAE,CAAC;qBACZ,CAAC;oBACF,MAAM;wBACL,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,QAAQ,SAAS;wBACnE,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,UAAU;wBACpB,GAAG,EAAE,GAAG;wBACR,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,OAAO;wBACd,MAAM,EAAE,KAAK;wBACb,UAAU,EAAE,iCAAiC;qBAC7C,CAAC;gBACH,CAAC;aACD;SACD;QAED,QAAQ,EAAE;YACT,wCAAwC;YACxC,CAAC,OAAO,EAAE,EAAE;gBACX,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC;oBAAE,OAAO,OAAO,CAAC;gBACrD,OAAO;oBACN,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;oBAC1C,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;iBAC9B,CAAC;YACH,CAAC;SACD;QAED,SAAS,kBACR,MAAM,EAAE,gCAAgC,EACxC,gBAAgB,EAAE,kCAAkC,EACpD,cAAc,EAAE,iDAAiD,EACjE,YAAY,EAAE,wCAAwC,EACtD,eAAe,EAAE,2CAA2C,EAC5D,GAAG,EAAE,uGAAuG,EAC5G,GAAG,EAAE,uGAAuG,EAC5G,cAAc,EACb,8EAA8E,EAC/E,MAAM,EAAE,oDAAoD,EAC5D,UAAU,EAAE,2BAA2B,EACvC,UAAU,EAAE,0BAA0B,EACtC,aAAa,EAAE,gBAAgB,EAC/B,SAAS,EAAE,wBAAwB,EACnC,KAAK,EAAE,aAAa,EACpB,iBAAiB,EAChB,6EAA6E,IAC3E,CAAC,UAAU;YACb,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACA,OAAO,EAAE,kBAAkB;gBAC3B,QAAQ,EAAE,mBAAmB;gBAC7B,UAAU,EAAE,qBAAqB;gBACjC,mBAAmB,EAAE,6BAA6B;gBAClD,WAAW,EAAE,sBAAsB;gBACnC,YAAY,EAAE,uBAAuB;gBACrC,eAAe,EAAE,yBAAyB;aACzC,CAAC,CACL;QAED,UAAU,EAAE;YACX;gBACC,KAAK,EAAE,YAAY;gBACnB,MAAM,EAAE,CAAC,GAA0B,EAAE,EAAE;;oBACtC,IAAI,WAAW;wBAAE,OAAO,0BAA0B,CAAC;oBAEnD,IAAI,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;wBAC7B,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;wBAClE,MAAM,KAAK,GAAG,OAAO,CACpB,MAAA,GAAG,CAAC,KAAK,CAAC,aAAa,mCAAI,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAC/D,CAAC;wBACF,OAAO,KAAK;6BACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,IAAI,IAAI,GAAG,IAAI,CAAC;6BACtD,IAAI,CAAC,EAAE,CAAC,CAAC;oBACZ,CAAC;gBACF,CAAC;aACM;YACR;gBACC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;oBACf,IAAI,WAAW;wBAAE,OAAO,EAAE,CAAC;oBAE3B,MAAM,eAAe,GAAG;;;;;QAKrB,0BAA0B,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC7C,MAAM,SAAS,GAAG;gCACS,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BjD,eAAe;KACjB,CAAC;oBACD,MAAM,QAAQ,GAAG;iCACW,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BhD,eAAe;MACjB,CAAC;oBAEF,MAAM,SAAS,GAAsC;wBACpD,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE;wBAClC,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;wBACpC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;wBACrC,SAAS,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE;wBACxC,QAAQ,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;wBACxC,IAAI,EAAE;4BACL,GAAG,EAAE,CAAC;4BACN,SAAS,EAAE,CAAC,EAAE;4BACd,aAAa,EAAE,CAAC;4BAChB,cAAc,EAAE,CAAC;4BACjB,GAAG,EAAE,IAAI;yBACT;wBACD,SAAS,EAAE;4BACV,GAAG,EAAE,CAAC;4BACN,SAAS,EAAE,CAAC,EAAE;4BACd,aAAa,EAAE,CAAC;4BAChB,cAAc,EAAE,CAAC;4BACjB,GAAG,EAAE,KAAK;yBACV;qBACD,CAAC;oBAEF,MAAM,QAAQ,GAAG,YAAY,CAAC;wBAC7B,OAAO,EAAE,SAAS,CAAC,KAAK;wBACxB,MAAM,EAAE,SAAS,CAAC,IAAI;qBACtB,CAAC,CAAC;oBACH,MAAM,OAAO,GAAG,YAAY,CAAC;wBAC5B,OAAO,EAAE,SAAS,CAAC,IAAI;wBACvB,MAAM,EAAE,SAAS,CAAC,KAAK;qBACvB,CAAC,CAAC;oBACH,MAAM,SAAS,GAAG,YAAY,CAAC;wBAC9B,OAAO,EAAE,SAAS,CAAC,MAAM;wBACzB,MAAM,EAAE,SAAS,CAAC,IAAI;qBACtB,CAAC,CAAC;oBACH,MAAM,YAAY,GAAG,YAAY,CAAC;wBACjC,OAAO,EAAE,SAAS,CAAC,SAAS;wBAC5B,MAAM,EAAE,SAAS,CAAC,IAAI;qBACtB,CAAC,CAAC;oBACH,MAAM,WAAW,GAAG,YAAY,CAAC;wBAChC,OAAO,EAAE,SAAS,CAAC,QAAQ;wBAC3B,MAAM,EAAE,SAAS,CAAC,IAAI;qBACtB,CAAC,CAAC;oBACH,MAAM,OAAO,GAAG,YAAY,CAAC;wBAC5B,OAAO,EAAE,SAAS,CAAC,IAAI;wBACvB,MAAM,EAAE,SAAS,CAAC,SAAS;qBAC3B,CAAC,CAAC;oBAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BA+BgB,eAAe;8BACb,WAAW;8BACX,WAAW;+BACV,YAAY;+BACZ,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;;;;;;OAO3C;oBACD,8EAA8E,CAAC,EAChF;;;;;;;;;;;;;;;;;;;;QAoBG,SAAS;;;QAGT,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ;;;;;;SAMjD,QAAQ;;;;;QAKT,QAAQ;;;;QAIR,YAAY;;;;QAIZ,WAAW;;;;QAIX,OAAO;;;;QAIP,SAAS;;;;QAIT,OAAO;;;;QAIP,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiCnB,SAAS;;;;;QAKT,QAAQ;;;;;QAKR,QAAQ;;;QAGR,YAAY;;;QAGZ,WAAW;;;QAGX,OAAO;;;QAGP,SAAS;;;QAGT,OAAO;;;;;;sBAMO,iBAAiB;;;;;;;;iBAQtB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6D/B,CAAC;gBACD,CAAC;aACD;SACD;QAED,OAAO,EAAE;YACR,WAAW,CAAC;gBACX,SAAS,EAAE,KAAK;aAChB,CAAC;SACF;KACD,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB;IACrC,uCACI,IAAI,KAAK,CAAC,EAAE,CAAC;SACd,IAAI,CAAC,CAAC,CAAC;SACP,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;SACjD,MAAM,CACN,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QACf,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACb,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAA4B,CAC5B,KAEF,EAAE,EAAE,wEAAwE,EAC5E,EAAE,EAAE,uEAAuE,EAC3E,EAAE,EAAE,qEAAqE,EACzE,EAAE,EAAE,qEAAqE,EACzE,EAAE,EAAE,qEAAqE,IACxE;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,KAAU;IACnD,IACC,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QACrB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAClB,CAAC;QACF,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;IAC/B,IAAI,aAAa,GAAQ,KAAK,CAAC;IAC/B,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI;YAAE,MAAM;QACjB,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAClC,WAAW,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,WAAW;YAAE,MAAM;IACzB,CAAC;IAED,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;QACrE,OAAO,aAAa,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,aAAa,CAAC;AACtB,CAAC"}

package/dist/esm/utilities.stories.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Button, P } from './components/index.js';
 const meta = {
-    title: 'Utility Classes',
+    title: 'System/Utility Classes',
     argTypes: {},
     parameters: {
         controls: { expanded: true },

package/dist/esm/utilities.stories.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.stories.js","sourceRoot":"","sources":["../../src/utilities.stories.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,IAAI,GAAG;IACZ,KAAK,EAAE,iBAAiB;IACxB,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE;QACX,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5B;CACc,CAAC;AAEjB,eAAe,IAAI,CAAC;AAIpB,MAAM,CAAC,MAAM,cAAc,GAAU;IACpC,MAAM,CAAC,IAAI;QACV,OAAO,CACN,eAAK,SAAS,EAAC,sDAAsD,aACpE,KAAC,CAAC,gdAQE,EACJ,KAAC,MAAM,IAAC,KAAK,EAAC,SAAS,EAAC,SAAS,EAAC,aAAa,uBAEtC,EACT,KAAC,GAAG,IACH,OAAO,EAAC,SAAS,EACjB,CAAC,QACD,SAAS,EAAC,gEAAgE,mCAGrE,EACN,KAAC,GAAG,IACH,OAAO,EAAC,QAAQ,EAChB,CAAC,QACD,SAAS,EAAC,yEAAyE,0CAG9E,EACN,KAAC,CAAC,0gBASE,IACC,CACN,CAAC;IACH,CAAC;CACD,CAAC"}
+{"version":3,"file":"utilities.stories.js","sourceRoot":"","sources":["../../src/utilities.stories.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,IAAI,GAAG;IACZ,KAAK,EAAE,wBAAwB;IAC/B,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE;QACX,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5B;CACc,CAAC;AAEjB,eAAe,IAAI,CAAC;AAIpB,MAAM,CAAC,MAAM,cAAc,GAAU;IACpC,MAAM,CAAC,IAAI;QACV,OAAO,CACN,eAAK,SAAS,EAAC,sDAAsD,aACpE,KAAC,CAAC,gdAQE,EACJ,KAAC,MAAM,IAAC,KAAK,EAAC,SAAS,EAAC,SAAS,EAAC,aAAa,uBAEtC,EACT,KAAC,GAAG,IACH,OAAO,EAAC,SAAS,EACjB,CAAC,QACD,SAAS,EAAC,gEAAgE,mCAGrE,EACN,KAAC,GAAG,IACH,OAAO,EAAC,QAAQ,EAChB,CAAC,QACD,SAAS,EAAC,yEAAyE,0CAG9E,EACN,KAAC,CAAC,0gBASE,IACC,CACN,CAAC;IACH,CAAC;CACD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a-type/ui",
-  "version": "2.4.1",
+  "version": "2.6.0",
   "type": "module",
   "files": [
     "/dist",
@@ -14,11 +14,11 @@
       "default": "./dist/cjs/index.js"
     },
     "./uno-preset": {
-      "types": "./dist/esm/uno.preset.d.ts",
-      "import": "./dist/esm/uno.preset.js",
-      "node": "./dist/esm/uno.preset.js",
-      "require": "./dist/cjs/uno.preset.js",
-      "default": "./dist/cjs/uno.preset.js"
+      "types": "./dist/esm/uno/uno.preset.d.ts",
+      "import": "./dist/esm/uno/uno.preset.js",
+      "node": "./dist/esm/uno/uno.preset.js",
+      "require": "./dist/cjs/uno/uno.preset.js",
+      "default": "./dist/cjs/uno/uno.preset.js"
     },
     "./main.css": {
       "import": "./dist/css/main.css",

package/src/colors.stories.tsx

@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { Box } from './components/index.js';
 
 const meta = {
-	title: 'colors',
+	title: 'System/Colors',
 	argTypes: {
 		customHue: {
 			control: {
@@ -42,13 +42,18 @@ export const Default: Story = {
 			: {};
 		return (
 			<Box d="col">
+				<Range className="theme" style={style} />
 				<Range className="theme-lemon" />
 				<Range className="theme-leek" />
 				<Range className="theme-tomato" />
 				<Range className="theme-eggplant" />
 				<Range className="theme-blueberry" />
 				<Range className="theme-salt" />
-				<Range className="theme" style={style} />
+				<Box className="h-100px">
+					<Box grow className="bg-black" />
+					<Box grow className="bg-wash" />
+					<Box grow className="bg-white" />
+				</Box>
 			</Box>
 		);
 	},
@@ -136,3 +141,95 @@ function ModifierRange({
 		</Box>
 	);
 }
+
+export const Inheritance: Story = {
+	render(args: any) {
+		const style: any = args.customHue
+			? {
+					'--dyn-primary-source': args.customHue,
+					'--dyn-primary-hue-rotate': args.customRotate,
+			  }
+			: {};
+		return (
+			<Box surface="primary" p="xl" className="theme" style={style}>
+				<Box
+					className="border-bg border-darken-5 color-bg color-darken-5"
+					border
+					p="xl"
+				>
+					Inherits and darkens
+				</Box>
+			</Box>
+		);
+	},
+};
+
+export const TweakOpacity: Story = {
+	render() {
+		// none of these elements have root opacity; all opacity is done through colors
+		return (
+			<Box surface="accent" className="h-32" full="width" p gap>
+				<Box
+					className="bg-primary/100 h-full color-primary-dark/100 ring ring-primary-light/100 border border-black/100"
+					grow
+				>
+					100
+				</Box>
+				<Box
+					className="bg-primary/90 h-full color-primary-dark/90 ring ring-primary-light/90 border border-black/90"
+					grow
+				>
+					90
+				</Box>
+				<Box
+					className="bg-primary/80 h-full color-primary-dark/80 ring ring-primary-light/80 border border-black/80"
+					grow
+				>
+					80
+				</Box>
+				<Box
+					className="bg-primary/70 h-full color-primary-dark/70 ring ring-primary-light/70 border border-black/70"
+					grow
+				>
+					70
+				</Box>
+				<Box
+					className="bg-primary/60 h-full color-primary-dark/60 ring ring-primary-light/60 border border-black/60"
+					grow
+				>
+					60
+				</Box>
+				<Box
+					className="bg-primary/50 h-full color-primary-dark/50 ring ring-primary-light/50 border border-black/50"
+					grow
+				>
+					50
+				</Box>
+				<Box
+					className="bg-primary/40 h-full color-primary-dark/40 ring ring-primary-light/40 border border-black/40"
+					grow
+				>
+					40
+				</Box>
+				<Box
+					className="bg-primary/30 h-full color-primary-dark/30 ring ring-primary-light/30 border border-black/30"
+					grow
+				>
+					30
+				</Box>
+				<Box
+					className="bg-primary/20 h-full color-primary-dark/20 ring ring-primary-light/20 border border-black/20"
+					grow
+				>
+					20
+				</Box>
+				<Box
+					className="bg-primary/10 h-full color-primary-dark/10 ring ring-primary-light/10 border border-black/10"
+					grow
+				>
+					10
+				</Box>
+			</Box>
+		);
+	},
+};

package/src/components/actions/ActionBar.stories.tsx

@@ -5,7 +5,7 @@ import { ActionBar } from './ActionBar.js';
 import { ActionButton } from './ActionButton.js';
 
 const meta = {
-	title: 'ActionBar',
+	title: 'Components/ActionBar',
 	component: ActionBar,
 	argTypes: {},
 	args: {

package/src/components/box/Box.stories.tsx

@@ -3,7 +3,7 @@ import { Button } from '../button/Button.js';
 import { Box } from './Box.js';
 
 const meta = {
-	title: 'Box',
+	title: 'Components/Box',
 	component: Box,
 	argTypes: {
 		border: {
@@ -14,6 +14,51 @@ const meta = {
 			type: 'boolean',
 			defaultValue: false,
 		},
+		elevated: {
+			type: 'string',
+			options: [
+				'sm',
+				'md',
+				'lg',
+				'xl',
+				'-sm',
+				'-md',
+				'-lg',
+				'-xl',
+				'sm-up',
+				'md-up',
+				'lg-up',
+				'xl-up',
+				'-sm-up',
+				'-md-up',
+				'-lg-up',
+				'-xl-up',
+			],
+			control: {
+				type: 'select',
+			},
+		},
+		layout: {
+			type: 'string',
+		},
+		wrap: {
+			type: 'boolean',
+		},
+		container: {
+			type: 'boolean',
+		},
+		theme: {
+			type: 'string',
+			options: ['lemon', 'leek', 'tomato', 'eggplant', 'blueberry', 'salt'],
+			control: {
+				type: 'select',
+			},
+		},
+		children: {
+			table: {
+				disable: true,
+			},
+		},
 	},
 	args: {
 		children: (