diff --git a/package.json b/package.json index 41a0fd68..61f5284c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "description": "UI library for Fxtrot initiatives", "version": "0.0.1", "license": "Apache-2.0", - "type": "module", "types": "dist/types/index.d.ts", "main": "./dist/fxtrot-ui.umd.js", "module": "./dist/fxtrot-ui.es.js", diff --git a/src/lib/button/button.tsx b/src/lib/button/button.tsx index f6cc08ae..44d1ebed 100644 --- a/src/lib/button/button.tsx +++ b/src/lib/button/button.tsx @@ -22,6 +22,7 @@ const Button = forwardRef((props, ref) => { className={buttonCssWithDefaults(props)} aria-label={label} title={label} + disabled={disabled} aria-disabled={disabled} type={type} ref={ref} diff --git a/src/lib/theme-provider/default-theme.cjs b/src/lib/theme-provider/default-theme.cjs index fa146d96..64f705cd 100644 --- a/src/lib/theme-provider/default-theme.cjs +++ b/src/lib/theme-provider/default-theme.cjs @@ -30,8 +30,8 @@ const defaultTheme = { 'on-surface-variant': 'hsl(215 6% 40%)', 'inverse-surface': 'hsl(225 4.1% 19.2%)', 'inverse-on-surface': 'hsl(255 15.4% 94.9%)', - 'disabled': 'hsl(0deg 0% 90%)', - 'on-disabled': 'hsl(204 9.1% 26%)', + 'disabled': 'hsl(0deg 0% 91%)', + 'on-disabled': 'hsl(204 9.1% 41%)', }, // Tailwind default + xs and popper boxShadow: {