diff --git a/pkgs/clan-cli/clan_cli/inventory/__init__.py b/pkgs/clan-cli/clan_cli/inventory/__init__.py index 87f63db57..ea8d65278 100644 --- a/pkgs/clan-cli/clan_cli/inventory/__init__.py +++ b/pkgs/clan-cli/clan_cli/inventory/__init__.py @@ -158,7 +158,6 @@ def find_deleted_paths( for key, p_value in persisted.items(): current_path = f"{parent_key}.{key}" if parent_key else key # Check if this key exists in update - # breakpoint() if key not in update: # Key doesn't exist at all -> entire branch deleted deleted_paths.add(current_path) diff --git a/pkgs/webview-ui/app/src/components/button/index.tsx b/pkgs/webview-ui/app/src/components/button/index.tsx index a49755833..6c0c5209d 100644 --- a/pkgs/webview-ui/app/src/components/button/index.tsx +++ b/pkgs/webview-ui/app/src/components/button/index.tsx @@ -5,7 +5,9 @@ import { Typography } from "../Typography"; type Variants = "dark" | "light" | "ghost"; type Size = "default" | "s"; -const variantColors: Record = { +const variantColors: ( + disabled: boolean | undefined, +) => Record = (disabled) => ({ dark: cx( "border border-solid", "border-secondary-950 bg-primary-900 text-white", @@ -13,9 +15,10 @@ const variantColors: Record = { // Hover state // Focus state // Active state - "hover:border-secondary-900 hover:bg-secondary-700", - "focus:border-secondary-900", - "active:border-secondary-900 active:shadow-inner-primary-active", + !disabled && "hover:border-secondary-900 hover:bg-secondary-700", + !disabled && "focus:border-secondary-900", + !disabled && + "active:border-secondary-900 active:shadow-inner-primary-active", // Disabled "disabled:bg-secondary-200 disabled:text-secondary-700 disabled:border-secondary-300", ), @@ -26,9 +29,10 @@ const variantColors: Record = { // Hover state // Focus state // Active state - "hover:bg-secondary-200 hover:text-secondary-900", - "focus:bg-secondary-200 focus:text-secondary-900", - "active:bg-secondary-200 active:text-secondary-950 active:shadow-inner-secondary-active", + !disabled && "hover:bg-secondary-200 hover:text-secondary-900", + !disabled && "focus:bg-secondary-200 focus:text-secondary-900", + !disabled && + "active:bg-secondary-200 active:text-secondary-950 active:shadow-inner-secondary-active", // Disabled "disabled:bg-secondary-50 disabled:text-secondary-200 disabled:border-secondary-700", ), @@ -37,13 +41,14 @@ const variantColors: Record = { // Hover state // Focus state // Active state - "hover:bg-secondary-200 hover:text-secondary-900", - "focus:bg-secondary-200 focus:text-secondary-900", - "active:bg-secondary-200 active:text-secondary-950 active:shadow-inner-secondary-active", + !disabled && "hover:bg-secondary-200 hover:text-secondary-900", + !disabled && "focus:bg-secondary-200 focus:text-secondary-900", + !disabled && + "active:bg-secondary-200 active:text-secondary-950 active:shadow-inner-secondary-active", // Disabled "disabled:bg-secondary-50 disabled:text-secondary-200 disabled:border-secondary-700", ), -}; +}); const sizePaddings: Record = { default: cx("rounded-[0.1875rem] px-4 py-2"), @@ -82,7 +87,7 @@ export const Button = (props: ButtonProps) => { "p-4", sizePaddings[local.size || "default"], // Colors - variantColors[local.variant || "dark"], + variantColors(props.disabled)[local.variant || "dark"], //Font "leading-none font-semibold", sizeFont[local.size || "default"],