diff --git a/.changeset/cold-drinks-matter.md b/.changeset/cold-drinks-matter.md new file mode 100644 index 0000000..4a8baa7 --- /dev/null +++ b/.changeset/cold-drinks-matter.md @@ -0,0 +1,7 @@ +--- +"@alice-ui/react": patch +"@alice-ui/theme": patch +--- + +Button hover effect added +disableAutosize prop added to Textarea, this disable the auto resize. \ No newline at end of file diff --git a/apps/storybook/package.json b/apps/storybook/package.json index 99e1c2d..28eddee 100644 --- a/apps/storybook/package.json +++ b/apps/storybook/package.json @@ -19,27 +19,27 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@storybook/addon-essentials": "^7.4.0", - "@storybook/addon-interactions": "^7.4.0", - "@storybook/addon-links": "^7.4.0", - "@storybook/blocks": "^7.4.0", - "@storybook/react": "^7.4.0", - "@storybook/react-vite": "^7.4.0", + "@storybook/addon-essentials": "^7.6.17", + "@storybook/addon-interactions": "^7.6.17", + "@storybook/addon-links": "^7.6.17", + "@storybook/blocks": "^7.6.17", + "@storybook/react": "^7.6.17", + "@storybook/react-vite": "^7.6.17", "@storybook/testing-library": "^0.2.0", - "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-react": "^4.0.3", - "autoprefixer": "^10.4.15", - "eslint": "^8.45.0", + "@types/react": "^18.2.57", + "@types/react-dom": "^18.2.19", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", + "@vitejs/plugin-react": "^4.2.1", + "autoprefixer": "^10.4.17", + "eslint": "^8.56.0", "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.4.3", - "postcss": "^8.4.29", - "storybook": "^7.4.0", - "storybook-dark-mode": "^3.0.1", - "tailwindcss": "^3.3.3", - "typescript": "^5.0.2", - "vite": "^4.4.5" + "eslint-plugin-react-refresh": "^0.4.5", + "postcss": "^8.4.35", + "storybook": "^7.6.17", + "storybook-dark-mode": "^3.0.3", + "tailwindcss": "^3.4.1", + "typescript": "^5.3.3", + "vite": "^4.5.2" } } diff --git a/package.json b/package.json index 5aad8d5..2dc96e9 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@changesets/cli": "^2.27.1", "@commitlint/cli": "^17.7.1", "@commitlint/config-conventional": "^17.7.0", - "@storybook/react": "^7.6.6", + "@storybook/react": "^7.6.17", "@types/node": "^20.10.5", "@types/react": "^18.2.45", "@types/react-dom": "^18.2.18", diff --git a/packages/react/package.json b/packages/react/package.json index 523e7b2..87deb2b 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -53,7 +53,7 @@ "@react-stately/utils": "^3.9.0", "@react-types/shared": "^3.22.0", "react-aria": "^3.31.0", - "react-aria-components": "1.0.0", + "react-aria-components": "1.1.1", "react-stately": "^3.29.0", "react-textarea-autosize": "^8.5.3" }, diff --git a/packages/react/src/button/button.tsx b/packages/react/src/button/button.tsx index 6367d21..3782a49 100644 --- a/packages/react/src/button/button.tsx +++ b/packages/react/src/button/button.tsx @@ -24,13 +24,13 @@ export interface ButtonProps extends AriaButtonProps, Omit) { isLoading, spinner = , spinnerPlacement = 'start', - leftIcon, - rightIcon, + startContent: startContentProp, + endContent: endContentProp, disableAnimation, disableRipple, className, @@ -104,19 +104,19 @@ function Button(props: ButtonProps, ref: ForwardedRef) { }) : null; - const leftIconNode = getIconClone(leftIcon); - const rightIconNode = getIconClone(rightIcon); + const startContent = getIconClone(startContentProp); + const endContent = getIconClone(endContentProp); return ( // @ts-ignore {({ isDisabled }) => ( <> - {leftIconNode} + {startContent} {isLoading && spinnerPlacement === 'start' &&
{spinner}
} <>{children} {isLoading && spinnerPlacement === 'end' && spinner} - {rightIconNode} + {endContent} {(!disableRipple || !isDisabled) && ( <>
diff --git a/packages/react/src/input/textarea.tsx b/packages/react/src/input/textarea.tsx index 61820c2..39b7521 100644 --- a/packages/react/src/input/textarea.tsx +++ b/packages/react/src/input/textarea.tsx @@ -21,6 +21,11 @@ type TextareaAutoSizeStyle = Omit< export interface TextAreaProps extends Omit, 'color' | 'size'>, InputVariantProps { + /** + * Whether the textarea should automatically grow vertically to accomodate content. + * @default false + */ + disableAutosize?: boolean; /** * Minimum number of rows to show for textarea * @default 3 @@ -73,6 +78,7 @@ function TextArea(props: TextAreaProps, ref: ForwardedRef) minRows = 3, maxRows = 8, cacheMeasurements = false, + disableAutosize = false, onHeightChange, ...otherProps } = props; @@ -106,17 +112,27 @@ function TextArea(props: TextAreaProps, ref: ForwardedRef) const inputProps = getInputProps(); + const content = disableAutosize ? ( +