@uxf/ui 10.0.0-beta.4 → 10.0.0-beta.40

package/_file-input-base/file-input-base.js

@@ -26,7 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._FileInputBase = void 0;
 const react_1 = __importStar(require("react"));
 exports._FileInputBase = (0, react_1.forwardRef)((props, ref) => {
-    const onChange = (e) => props.onChange(null, e);
+    const onChange = async (e) => {
+        if (e.target.files) {
+            const res = await props.onUploadFile(e.target.files[0]);
+            props.onChange(res, e);
+        }
+        else {
+            props.onChange(null, e);
+        }
+    };
     return (react_1.default.createElement("input", { accept: props.accept, "aria-invalid": props.isInvalid, "aria-describedby": props["aria-describedby"], className: props.className, disabled: props.isDisabled, form: props.form, id: props.id, name: props.name, onBlur: props.onBlur, onChange: onChange, onFocus: props.onFocus, readOnly: props.isReadOnly, ref: ref, required: props.isRequired, tabIndex: props.isDisabled ? -1 : undefined, type: "file" }));
 });
 exports._FileInputBase.displayName = "UxfUiFileInputBase";

package/_select-base/_select-base.d.ts

@@ -3,7 +3,7 @@ import type { Combobox as HUICombobox, Listbox as HUIListbox } from "@headlessui
 import { IconsSet } from "@uxf/ui/icon/theme";
 import { Clearable, FormControlProps } from "@uxf/ui/types";
 import React, { ReactElement, ReactNode, Ref } from "react";
-import { InputGroupSizes, InputGroupVariants } from "../input/theme";
+import { InputGroupSizes, InputGroupVariants } from "@uxf/ui/input/theme";
 export type SelectBaseValueId = number | string;
 export type SelectBaseValue<ValueId = SelectBaseValueId> = {
     id: ValueId;

package/_select-base/_select-base.js

@@ -51,8 +51,9 @@ const InputArrow = (props) => {
     return react_2.default.createElement(icon_1.Icon, { className: (0, cx_1.cx)("uxf-select-base__arrow-icon", props.open && classes_1.CLASSES.IS_OPEN), name: iconName });
 };
 const Options = (props) => {
+    var _a, _b;
     const HUIComponent = props.HUIComponent;
-    return (react_2.default.createElement(HUIComponent.Options, { className: (0, cx_1.cx)("uxf-dropdown", props.placement === "bottom" && "uxf-dropdown--bottom", props.placement === "top" && "uxf-dropdown--top"), ref: props.forwardRef, static: true, style: props.style }, props.options && props.options.length > 0 ? (props.options.map((option) => {
+    return (react_2.default.createElement(HUIComponent.Options, { className: (0, cx_1.cx)("uxf-dropdown", `uxf-dropdown--size-${(_a = props.size) !== null && _a !== void 0 ? _a : "default"}`, `uxf-dropdown--variant-${(_b = props.variant) !== null && _b !== void 0 ? _b : "default"}`, props.placement === "bottom" && "uxf-dropdown--bottom", props.placement === "top" && "uxf-dropdown--top"), ref: props.forwardRef, static: true, style: props.style }, props.options && props.options.length > 0 ? (props.options.map((option) => {
         var _a, _b, _c, _d;
         const optionKey = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, option);
         return (react_2.default.createElement(HUIComponent.Option, { className: (optionState) => (0, cx_1.cx)("uxf-dropdown__item", optionState.active && classes_1.CLASSES.IS_ACTIVE, optionState.disabled && classes_1.CLASSES.IS_DISABLED, optionState.selected && classes_1.CLASSES.IS_SELECTED), key: optionKey !== null && optionKey !== void 0 ? optionKey : option.id, value: option }, (_d = (_c = (_b = props.renderOption) === null || _b === void 0 ? void 0 : _b.call(props, option)) !== null && _c !== void 0 ? _c : optionKey) !== null && _d !== void 0 ? _d : option.label));
@@ -69,7 +70,7 @@ const _SelectBase = (props) => {
     const dropdown = (0, use_dropdown_1.useDropdown)((_b = props.dropdownPlacement) !== null && _b !== void 0 ? _b : "bottom", true, props.dropdownStrategy);
     const stableRef = (0, react_2.useMemo)(() => (0, composeRefs_1.composeRefs)(innerRef, props.forwardRef, dropdown.refs.setReference), [dropdown.refs.setReference, props.forwardRef]);
     const HUIComponent = props.HUIComponent;
-    return (react_2.default.createElement(HUIComponent, { as: "div", className: (0, cx_1.cx)("uxf-form-component uxf-select-base", props.isInvalid && classes_1.CLASSES.IS_INVALID, props.isRequired && classes_1.CLASSES.IS_REQUIRED, props.isReadOnly && classes_1.CLASSES.IS_READONLY, props.isDisabled && classes_1.CLASSES.IS_DISABLED, props.className), disabled: props.isDisabled || props.isReadOnly, onChange: props.onChange, value: props.value }, (renderProps) => (react_2.default.createElement(react_2.default.Fragment, null,
+    return (react_2.default.createElement(HUIComponent, { as: "div", className: (0, cx_1.cx)("uxf-form-component uxf-select-base", props.isInvalid && classes_1.CLASSES.IS_INVALID, props.isRequired && classes_1.CLASSES.IS_REQUIRED, props.isReadOnly && classes_1.CLASSES.IS_READONLY, props.isDisabled && classes_1.CLASSES.IS_DISABLED, props.className), "data-testid": id, disabled: props.isDisabled || props.isReadOnly, onChange: props.onChange, value: props.value }, (renderProps) => (react_2.default.createElement(react_2.default.Fragment, null,
         react_2.default.createElement("div", { className: "uxf-form-component__label" },
             react_2.default.createElement(HUIComponent.Label, { as: label_1.Label, isHidden: props.hiddenLabel, onClick: props.isDisabled || props.isReadOnly ? undefined : input.focus }, props.label)),
         react_2.default.createElement("div", { className: "uxf-form-component__input" },
@@ -87,7 +88,7 @@ const _SelectBase = (props) => {
                         react_2.default.createElement(InputArrow, { iconName: props.iconName, open: renderProps.open }))) : (react_2.default.createElement(InputArrow, { iconName: props.iconName, open: renderProps.open }))),
                 props.rightAddon && react_2.default.createElement(input_1.Input.RightAddon, null, props.rightAddon)),
             renderProps.open && (react_2.default.createElement(react_1.FloatingPortal, null,
-                react_2.default.createElement(Options, { HUIComponent: HUIComponent, emptyMessage: props.emptyMessage, forwardRef: dropdown.refs.setFloating, keyExtractor: props.keyExtractor, options: props.options, placement: dropdown.placement, renderOption: props.renderOption, style: dropdown.floatingStyles }))),
+                react_2.default.createElement(Options, { HUIComponent: HUIComponent, emptyMessage: props.emptyMessage, forwardRef: dropdown.refs.setFloating, keyExtractor: props.keyExtractor, options: props.options, placement: dropdown.placement, renderOption: props.renderOption, size: props.size, style: dropdown.floatingStyles, variant: props.variant }))),
             props.helperText && (react_2.default.createElement("div", { className: (0, cx_1.cx)("uxf-helper-text", props.isInvalid && classes_1.CLASSES.IS_INVALID), id: errorId }, props.helperText)))))));
 };
 exports._SelectBase = _SelectBase;

package/calendar/calendar-day-cell.js

@@ -34,7 +34,7 @@ const useOnMount_1 = require("@uxf/core/hooks/useOnMount");
 exports.CalendarDayCell = (0, react_1.memo)((props) => {
     const dayCellRef = (0, react_1.useRef)(null);
     const innerRef = (0, react_1.useRef)(null);
-    const { focusedDate, isDateBlocked, isDateFocused, isDateHovered, isDateSelected, onDateFocus, onDateHover, onDateSelect, } = (0, react_1.useContext)(date_picker_context_1.DatePickerContext);
+    const { focusedDate, isDateBlocked, isDateFocused, isDateHovered, isDateSelected, onDateFocus, onDateHover, onDateSelect, preventScroll, } = (0, react_1.useContext)(date_picker_context_1.DatePickerContext);
     const { disabledDate, isSelected, onClick, onKeyDown, onMouseEnter, tabIndex, isToday } = (0, use_day_1.useDay)({
         date: props.day.date,
         focusedDate,
@@ -46,11 +46,12 @@ exports.CalendarDayCell = (0, react_1.memo)((props) => {
         onDateHover,
         onDateSelect,
         dayRef: dayCellRef,
+        preventScroll,
     });
     (0, useOnMount_1.useOnMount)(() => {
         const node = innerRef.current;
         if (node && (isToday || isSelected)) {
-            node.focus({ preventScroll: true });
+            node.focus({ preventScroll });
         }
     });
     if (!props.day.dayLabel) {

package/chip/chip.d.ts

@@ -1,13 +1,11 @@
-import { ChipColors, ChipSizes, ChipVariants } from "@uxf/ui/chip/theme";
-import React, { HTMLAttributes, MouseEventHandler } from "react";
-export type ChipColor = keyof ChipColors;
-export type ChipSize = keyof ChipSizes;
-export type ChipVariant = keyof ChipVariants;
-export interface ChipProps extends HTMLAttributes<HTMLDivElement> {
+import { ChipColor, ChipSize, ChipVariant } from "@uxf/ui/chip/theme";
+import React, { AnchorHTMLAttributes, MouseEventHandler } from "react";
+import { UseAnchorProps } from "@uxf/core/hooks/useAnchorProps";
+export interface ChipProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>, "color" | "type">, UseAnchorProps {
     color?: ChipColor;
     onClose?: MouseEventHandler;
     size?: ChipSize;
     suppressFocus?: boolean;
     variant?: ChipVariant;
 }
-export declare const Chip: React.ForwardRefExoticComponent<ChipProps & React.RefAttributes<HTMLDivElement>>;
+export declare const Chip: React.ForwardRefExoticComponent<ChipProps & React.RefAttributes<HTMLAnchorElement>>;

package/chip/chip.js

@@ -26,15 +26,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Chip = void 0;
 const cx_1 = require("@uxf/core/utils/cx");
 const react_1 = __importStar(require("react"));
+const useAnchorProps_1 = require("@uxf/core/hooks/useAnchorProps");
+const CloseButton = (props) => {
+    const onClose = (e) => {
+        var _a;
+        e.preventDefault();
+        e.stopPropagation();
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    };
+    return (react_1.default.createElement("button", { className: "uxf-chip__button", onClick: onClose, tabIndex: props.suppressFocus ? -1 : undefined, type: "button" },
+        react_1.default.createElement("span", { className: "uxf-chip__button-label" }, "Odebrat polo\u017Eku"),
+        react_1.default.createElement("svg", { className: "uxf-chip__button-icon", stroke: "currentColor", fill: "none", viewBox: "0 0 8 8" },
+            react_1.default.createElement("path", { strokeLinecap: "round", strokeWidth: "1.5", d: "M1 1l6 6m0-6L1 7" }))));
+};
 exports.Chip = (0, react_1.forwardRef)((props, ref) => {
     var _a, _b, _c;
-    const { children, className, onClose, suppressFocus, ...restProps } = props;
+    const { children, className, onClose, suppressFocus, tabIndex, ...restProps } = props;
     const chipClassName = (0, cx_1.cx)("uxf-chip", `uxf-chip--color-${(_a = props.color) !== null && _a !== void 0 ? _a : "default"}`, `uxf-chip--size-${(_b = props.size) !== null && _b !== void 0 ? _b : "default"}`, `uxf-chip--variant-${(_c = props.variant) !== null && _c !== void 0 ? _c : "default"}`, onClose && "has-button", className);
-    return (react_1.default.createElement("div", { className: chipClassName, ref: ref, ...restProps },
+    const anchorProps = (0, useAnchorProps_1.useAnchorProps)({
+        className: (0, cx_1.cx)(chipClassName),
+        tabIndex: suppressFocus ? -1 : tabIndex,
+        ...restProps,
+    });
+    return (react_1.default.createElement("a", { ref: ref, ...anchorProps },
         typeof children === "string" ? react_1.default.createElement("span", { className: "uxf-chip__text" }, children) : children,
-        onClose && (react_1.default.createElement("button", { className: "uxf-chip__button", onClick: onClose, tabIndex: suppressFocus ? -1 : undefined, type: "button" },
-            react_1.default.createElement("span", { className: "sr-only" }, "Remove option"),
-            react_1.default.createElement("svg", { stroke: "currentColor", fill: "none", viewBox: "0 0 8 8" },
-                react_1.default.createElement("path", { strokeLinecap: "round", strokeWidth: "1.5", d: "M1 1l6 6m0-6L1 7" }))))));
+        !!onClose && react_1.default.createElement(CloseButton, { onClose: onClose })));
 });
-exports.Chip.displayName = "UxfUiChip";
+exports.Chip.displayName = "UxfChip";

package/chip/chip.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/chip/chip.spec.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importDefault(require("react"));
+const snap_test_1 = require("../utils/snap-test");
+const chip_stories_1 = require("./chip.stories");
+(0, snap_test_1.snapTest)("render stories", react_1.default.createElement(chip_stories_1.Default, null));

package/chip/chip.stories.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 declare const _default: {
     title: string;
-    component: React.ForwardRefExoticComponent<import("@uxf/ui/chip").ChipProps & React.RefAttributes<HTMLDivElement>>;
+    component: React.ForwardRefExoticComponent<import("@uxf/ui/chip").ChipProps & React.RefAttributes<HTMLAnchorElement>>;
     parameters: {
         docs: {};
     };

package/chip/chip.stories.js

@@ -1,10 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const chip_1 = require("@uxf/ui/chip");
 const storybook_config_1 = require("../utils/storybook-config");
 exports.default = {
@@ -16,34 +36,23 @@ exports.default = {
         },
     },
 };
-const getChipsForSize = (size, colors) => {
-    const lowChips = colors.map((color) => (react_1.default.createElement("div", { key: color },
-        react_1.default.createElement(chip_1.Chip, { variant: "low", size: size, color: color, onClose: () => null }, color))));
-    const mediumChips = colors.map((color) => (react_1.default.createElement("div", { key: color },
-        react_1.default.createElement(chip_1.Chip, { variant: "medium", size: size, color: color }, color))));
-    const defaultChips = colors.map((color) => (react_1.default.createElement("div", { key: color },
-        react_1.default.createElement(chip_1.Chip, { variant: "default", size: size, color: color }, color))));
-    return (react_1.default.createElement("div", { className: "grid grid-cols-3 gap-4" },
-        react_1.default.createElement("div", { className: "flex flex-col gap-2" }, lowChips),
-        react_1.default.createElement("div", { className: "flex flex-col gap-2" }, mediumChips),
-        react_1.default.createElement("div", { className: "flex flex-col gap-2" }, defaultChips)));
+const getChipsForSize = (colors) => {
+    const sizes = ["small", "default", "large"];
+    const variants = ["low", "medium", "default"];
+    return sizes.map((size) => (react_1.default.createElement(react_1.Fragment, { key: size },
+        react_1.default.createElement("div", { className: "uxf-typo-h5" }, size),
+        react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" },
+            react_1.default.createElement("div", { className: "grid grid-cols-3 gap-4", key: size }, variants.map((variant) => (react_1.default.createElement("div", { className: "flex flex-col gap-2", key: `${size}${variant}` }, colors.map((color) => (react_1.default.createElement("div", { className: "flex flex-col items-start space-y-2", key: `${size}${variant}${color}` },
+                react_1.default.createElement(chip_1.Chip, { color: color, size: size, variant: variant }, color),
+                react_1.default.createElement(chip_1.Chip, { color: color, size: size, onClose: () => null, variant: variant }, color),
+                react_1.default.createElement(chip_1.Chip, { color: color, href: "https://uxf.cz", onClose: () => null, size: size, target: "_blank", variant: variant },
+                    "#",
+                    color))))))))))));
 };
 function Default() {
     const config = (0, storybook_config_1.useStorybookConfig)("Chip");
     return (react_1.default.createElement("div", { className: "flex lg:flex-row" },
-        react_1.default.createElement("div", { className: "light space-y-4 rounded bg-white p-10" },
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "small"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("small", config.colors)),
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "default"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("default", config.colors)),
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "large"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("large", config.colors))),
-        react_1.default.createElement("div", { className: "dark space-y-4 rounded bg-gray-900 p-10 text-white" },
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "small"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("small", config.colors)),
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "default"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("default", config.colors)),
-            react_1.default.createElement("div", { className: "uxf-typo-h5" }, "large"),
-            react_1.default.createElement("div", { className: "flex flex-col space-y-4 px-5" }, getChipsForSize("large", config.colors)))));
+        react_1.default.createElement("div", { className: "light space-y-4 rounded bg-white p-10" }, getChipsForSize(config.colors)),
+        react_1.default.createElement("div", { className: "dark space-y-4 rounded bg-gray-900 p-10 text-white" }, getChipsForSize(config.colors))));
 }
 exports.Default = Default;

package/chip/index.d.ts

@@ -1 +1,3 @@
-export * from "./chip";
+export type { ChipColor, ChipSize, ChipVariant } from "./theme";
+export type { ChipProps } from "./chip";
+export { Chip } from "./chip";

package/chip/index.js

@@ -1,17 +1,5 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./chip"), exports);
+exports.Chip = void 0;
+var chip_1 = require("./chip");
+Object.defineProperty(exports, "Chip", { enumerable: true, get: function () { return chip_1.Chip; } });

package/chip/theme.d.ts

@@ -20,3 +20,6 @@ export interface ChipVariants {
     medium: true;
     low: true;
 }
+export type ChipColor = keyof ChipColors;
+export type ChipSize = keyof ChipSizes;
+export type ChipVariant = keyof ChipVariants;

package/css/calendar.css

@@ -1,6 +1,12 @@
 .uxf-calendar {
-    &__cell-day {
+    &__cell {
+        --bg-color: unset;
+        --color: unset;
+        --compensated-radii: calc(theme("borderRadius.md") - theme("spacing.px"));
+
         align-items: center;
+        background-color: var(--bg-color);
+        color: var(--color);
         display: flex;
         font-size: 14px;
         font-weight: theme("fontWeight.medium");
@@ -12,29 +18,29 @@
         text-align: center;
 
         :root .light & {
-            background-color: theme("backgroundColor.white");
-            color: theme("colors.lightMedium");
+            --bg-color: theme("backgroundColor.white");
+            --color: theme("colors.lightMedium");
         }
 
         :root .dark & {
-            background-color: theme("backgroundColor.gray.900");
-            color: theme("colors.darkMedium");
+            --bg-color: theme("backgroundColor.gray.900");
+            --color: theme("colors.darkMedium");
         }
 
         &:hover {
             :root .light & {
-                background-color: theme("backgroundColor.gray.50");
+                --bg-color: theme("backgroundColor.gray.50");
             }
 
             :root .dark & {
-                background-color: theme("backgroundColor.gray.950");
+                --bg-color: theme("backgroundColor.gray.950");
             }
         }
 
         &:focus-visible {
             &::before {
-                border: 2px solid theme("colors.primary.500");
                 border-radius: 2px;
+                border: 2px solid theme("colors.primary.500");
                 content: "";
                 inset: 0;
                 position: absolute;
@@ -45,50 +51,33 @@
             cursor: auto;
 
             :root .light & {
-                background-color: theme("backgroundColor.gray.100");
+                --bg-color: theme("backgroundColor.gray.100");
             }
 
             :root .dark & {
-                background-color: theme("backgroundColor.gray.800");
+                --bg-color: theme("backgroundColor.gray.800");
             }
         }
 
-        --compensated-radii: calc(theme("borderRadius.md") - theme("spacing.px"));
-
         &:first-child {
             border-top-left-radius: var(--compensated-radii);
         }
 
-        &:nth-child(7) {
-            border-top-right-radius: var(--compensated-radii);
-        }
-
-        &:nth-last-child(7) {
-            border-bottom-left-radius: var(--compensated-radii);
-        }
-
         &:last-child {
             border-bottom-right-radius: var(--compensated-radii);
         }
 
         &--selected {
-            :root .light & {
-                background-color: theme("backgroundColor.primary.500");
-                color: theme("colors.white");
-            }
-
+            :root .light &,
             :root .dark & {
-                background-color: theme("backgroundColor.primary.500");
-                color: theme("colors.white");
+                --bg-color: theme("backgroundColor.primary.500");
+                --color: theme("colors.white");
             }
 
             &:hover {
-                :root .light & {
-                    background-color: theme("backgroundColor.primary.500");
-                }
-
+                :root .light &,
                 :root .dark & {
-                    background-color: theme("backgroundColor.primary.500");
+                    --bg-color: theme("backgroundColor.primary.500");
                 }
             }
         }
@@ -104,14 +93,15 @@
                 width: 32px;
 
                 :root .light & {
-                    background-color: theme("backgroundColor.lightHigh");
-                    color: theme("colors.white");
+                    --bg-color: theme("backgroundColor.lightHigh");
+                    --color: theme("colors.white");
                 }
 
                 :root .dark & {
-                    background-color: theme("backgroundColor.transparent");
+                    --bg-color: theme("backgroundColor.transparent");
+                    --color: theme("colors.white");
+
                     border: 2px solid theme("colors.darkMedium");
-                    color: theme("colors.white");
                 }
             }
 
@@ -126,25 +116,29 @@
 
         &--not-current-month {
             :root .light & {
-                background-color: theme("backgroundColor.gray.100");
-                color: theme("colors.lightLow");
+                --bg-color: theme("backgroundColor.gray.100");
+                --color: theme("colors.lightLow");
             }
 
             :root .dark & {
-                background-color: theme("backgroundColor.gray.800");
-                color: theme("colors.darkLow");
+                --bg-color: theme("backgroundColor.gray.800");
+                --color: theme("colors.darkLow");
             }
         }
     }
 
-    &__cell-month,
-    &__cell-year {
-        --compensated-radii: calc(theme("borderRadius.md") - theme("spacing.px"));
+    &__cell-day {
+        &:nth-child(7) {
+            border-top-right-radius: var(--compensated-radii);
+        }
 
-        &:first-child {
-            border-top-left-radius: var(--compensated-radii);
+        &:nth-last-child(7) {
+            border-bottom-left-radius: var(--compensated-radii);
         }
+    }
 
+    &__cell-month,
+    &__cell-year {
         &:nth-child(3) {
             border-top-right-radius: var(--compensated-radii);
         }
@@ -152,9 +146,16 @@
         &:nth-last-child(3) {
             border-bottom-left-radius: var(--compensated-radii);
         }
+    }
 
-        &:last-child {
-            border-bottom-right-radius: var(--compensated-radii);
+    &__cell-hour,
+    &__cell-minute {
+        &:nth-child(6) {
+            border-top-right-radius: var(--compensated-radii);
+        }
+
+        &:nth-last-child(6) {
+            border-bottom-left-radius: var(--compensated-radii);
         }
     }
 
@@ -188,7 +189,9 @@
 
     &__days,
     &__year,
-    &__decade {
+    &__decade,
+    &__hours,
+    &__minutes {
         border-radius: 6px;
         display: grid;
         gap: 1px;
@@ -212,4 +215,9 @@
     &__decade {
         grid-template-columns: repeat(3, minmax(0, 1fr));
     }
+
+    &__hours,
+    &__minutes {
+        grid-template-columns: repeat(6, minmax(0, 1fr));
+    }
 }