feat: support RSC

gravity-ui · May 15, 2024 · 6ddb8d2 · 6ddb8d2
1 parent 33de0a0
commit 6ddb8d2
Show file tree

Hide file tree

Showing 115 changed files with 315 additions and 103 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -164,9 +164,9 @@
         "npm-run-all": "^4.1.5",
         "postcss": "^8.4.33",
         "prettier": "^3.2.4",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
         "react-docgen-typescript": "^2.2.2",
-        "react-dom": "^18.2.0",
+        "react-dom": "^18.3.1",
         "rimraf": "^5.0.5",
         "sass": "^1.70.0",
         "sass-loader": "^14.0.0",

diff --git a/src/components/ActionTooltip/ActionTooltip.tsx b/src/components/ActionTooltip/ActionTooltip.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {useForkRef} from '../../hooks';

diff --git a/src/components/Alert/AlertAction.tsx b/src/components/Alert/AlertAction.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {Button} from '../Button';

diff --git a/src/components/Alert/AlertActions.tsx b/src/components/Alert/AlertActions.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {Flex} from '../layout';

diff --git a/src/components/Alert/AlertContextProvider.tsx b/src/components/Alert/AlertContextProvider.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {AlertContext} from './AlertContext';

diff --git a/src/components/Alert/useAlertContext.tsx b/src/components/Alert/useAlertContext.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {AlertContext} from './AlertContext';

diff --git a/src/components/Avatar/Avatar.tsx b/src/components/Avatar/Avatar.tsx
@@ -26,10 +26,7 @@ export const Avatar = React.forwardRef<HTMLDivElement, AvatarProps>((props, ref)
         qa,
     } = props;
 
-    const style = React.useMemo(
-        () => ({backgroundColor, color: borderColor, ...styleProp}),
-        [backgroundColor, borderColor, styleProp],
-    );
+    const style = {backgroundColor, color: borderColor, ...styleProp};
 
     const renderContent = () => {
         if ('imgUrl' in props && props.imgUrl) {

diff --git a/src/components/Avatar/AvatarIcon/AvatarIcon.tsx b/src/components/Avatar/AvatarIcon/AvatarIcon.tsx
@@ -14,7 +14,7 @@ const avatarSizeToIconSize: Record<AvatarSize, number> = {
 };
 
 export const AvatarIcon = ({icon, color, size, className}: AvatarIconProps) => {
-    const style = React.useMemo(() => ({color}), [color]);
+    const style = {color};
 
     return (
         <div style={style} className={className}>

diff --git a/src/components/Avatar/AvatarImage/AvatarImage.tsx b/src/components/Avatar/AvatarImage/AvatarImage.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {AVATAR_SIZES} from '../constants';

diff --git a/src/components/Avatar/AvatarText/AvatarText.tsx b/src/components/Avatar/AvatarText/AvatarText.tsx
@@ -4,8 +4,8 @@ import type {AvatarTextProps} from './types';
 import {getAvatarDisplayText} from './utils';
 
 export const AvatarText = ({text, color, className}: AvatarTextProps) => {
-    const style = React.useMemo(() => ({color}), [color]);
-    const displayText = React.useMemo(() => getAvatarDisplayText(text), [text]);
+    const style = {color};
+    const displayText = getAvatarDisplayText(text);
 
     return (
         <div style={style} className={className}>

diff --git a/src/components/Avatar/AvatarText/utils.ts b/src/components/Avatar/AvatarText/utils.ts
@@ -1,5 +1,5 @@
 export const getAvatarDisplayText = (text: string) => {
-    const words = text.split(' ');
+    const words = text.split(/\s+/);
     const result =
         words.length > 1 ? [words[0][0], words[1][0]].filter(Boolean).join('') : text.slice(0, 2);
 

diff --git a/src/components/Breadcrumbs/Breadcrumbs.tsx b/src/components/Breadcrumbs/Breadcrumbs.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import _throttle from 'lodash/throttle';

diff --git a/src/components/Breadcrumbs/BreadcrumbsItem.tsx b/src/components/Breadcrumbs/BreadcrumbsItem.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {Link} from '../Link';

diff --git a/src/components/Breadcrumbs/BreadcrumbsMore.tsx b/src/components/Breadcrumbs/BreadcrumbsMore.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {DropdownMenu} from '../DropdownMenu';

diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
@@ -1,12 +1,14 @@
+'use client';
+
 import React from 'react';
 
 import type {DOMProps, QAProps} from '../types';
 import {block} from '../utils/cn';
-import {isIcon} from '../utils/common';
+import {isIcon, isSvg} from '../utils/common';
 import {eventBroker} from '../utils/event-broker';
 import {isOfType} from '../utils/isOfType';
 
-import {ButtonIcon} from './ButtonIcon';
+import {ButtonIcon, buttonIconDataAttr, getIconSide} from './ButtonIcon';
 
 import './Button.scss';
 
@@ -193,16 +195,21 @@ ButtonWithHandlers.displayName = 'Button';
 export const Button = Object.assign(ButtonWithHandlers, {Icon: ButtonIcon});
 
 const isButtonIconComponent = isOfType(ButtonIcon);
+const isSpan = isOfType<{[buttonIconDataAttr]?: boolean; className?: string}>('span');
 
+// eslint-disable-next-line complexity
 function prepareChildren(children: React.ReactNode) {
     const items = React.Children.toArray(children);
 
     if (items.length === 1) {
         const onlyItem = items[0];
+        const isButtonIconElement =
+            isButtonIconComponent(onlyItem) ||
+            (isSpan(onlyItem) && onlyItem.props[buttonIconDataAttr]);
 
-        if (isButtonIconComponent(onlyItem)) {
+        if (isButtonIconElement) {
             return onlyItem;
-        } else if (isIcon(onlyItem)) {
+        } else if (isIcon(onlyItem) || isSvg(onlyItem)) {
             return <Button.Icon key="icon">{onlyItem}</Button.Icon>;
         } else {
             return (
@@ -216,10 +223,12 @@ function prepareChildren(children: React.ReactNode) {
         const content = [];
 
         for (const item of items) {
-            const isIconElement = isIcon(item);
+            const isIconElement = isIcon(item) || isSvg(item);
             const isButtonIconElement = isButtonIconComponent(item);
+            const isRenderedButtonIconElement =
+                isSpan(item) && item.props[buttonIconDataAttr] === true;
 
-            if (isIconElement || isButtonIconElement) {
+            if (isIconElement || isButtonIconElement || isRenderedButtonIconElement) {
                 if (!startIcon && content.length === 0) {
                     const key = 'icon-start';
                     const side = 'start';
@@ -229,10 +238,14 @@ function prepareChildren(children: React.ReactNode) {
                                 {item}
                             </Button.Icon>
                         );
-                    } else {
+                    } else if (isButtonIconElement) {
                         startIcon = React.cloneElement(item, {
                             side,
                         });
+                    } else {
+                        startIcon = React.cloneElement(item, {
+                            className: b('icon', {side: getIconSide(side)}, item.props.className),
+                        });
                     }
                 } else if (!endIcon && content.length !== 0) {
                     const key = 'icon-end';
@@ -243,10 +256,14 @@ function prepareChildren(children: React.ReactNode) {
                                 {item}
                             </Button.Icon>
                         );
-                    } else {
+                    } else if (isButtonIconElement) {
                         endIcon = React.cloneElement(item, {
                             side,
                         });
+                    } else {
+                        endIcon = React.cloneElement(item, {
+                            className: b('icon', {side: getIconSide(side)}, item.props.className),
+                        });
                     }
                 }
             } else {

diff --git a/src/components/Button/ButtonIcon.tsx b/src/components/Button/ButtonIcon.tsx
@@ -4,6 +4,7 @@ import {block} from '../utils/cn';
 import {warnOnce} from '../utils/warn';
 
 const b = block('button');
+export const buttonIconDataAttr = 'data-g-button-icon';
 
 type Props = React.PropsWithChildren<{
     className?: string;
@@ -17,23 +18,13 @@ function warnAboutPhysicalValues() {
 }
 
 export const ButtonIcon = ({side, className, children}: Props) => {
-    let sideMod = side;
-
-    if (sideMod === 'left') {
-        warnAboutPhysicalValues();
-        sideMod = 'start';
-    }
-    if (sideMod === 'right') {
-        warnAboutPhysicalValues();
-        sideMod = 'end';
-    }
-
     return (
         <span
+            {...{[buttonIconDataAttr]: true}}
             className={b(
                 'icon',
                 {
-                    side: sideMod,
+                    side: getIconSide(side),
                 },
                 className,
             )}
@@ -44,3 +35,18 @@ export const ButtonIcon = ({side, className, children}: Props) => {
 };
 
 ButtonIcon.displayName = 'Button.Icon';
+
+export function getIconSide(side?: 'left' | 'right' | 'start' | 'end') {
+    let sideMod = side;
+
+    if (sideMod === 'left') {
+        warnAboutPhysicalValues();
+        sideMod = 'start';
+    }
+    if (sideMod === 'right') {
+        warnAboutPhysicalValues();
+        sideMod = 'end';
+    }
+
+    return sideMod;
+}
diff --git a/src/components/Button/index.ts b/src/components/Button/index.ts
@@ -1 +1,2 @@
 export * from './Button';
+export {ButtonIcon} from './ButtonIcon';
diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {useActionHandlers} from '../../hooks';

diff --git a/src/components/Checkbox/Checkbox.tsx b/src/components/Checkbox/Checkbox.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {useCheckbox} from '../../hooks/private';

diff --git a/src/components/Checkbox/__stories__/CheckboxShowcase.tsx b/src/components/Checkbox/__stories__/CheckboxShowcase.tsx
@@ -8,50 +8,50 @@ export function CheckboxShowcase() {
     return (
         <Showcase>
             <ShowcaseItem title="Size">
-                <p>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox size="m" checked={false} content="size m" />
                     <span style={{margin: '8px'}} />
                     <Checkbox size="m" checked={true} content="size m" />
                     <span style={{margin: '8px'}} />
                     <Checkbox size="m" indeterminate={true} content="size m" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox size="l" checked={false} content="size l" />
                     <span style={{margin: '8px'}} />
                     <Checkbox size="l" checked={true} content="size l" />
                     <span style={{margin: '8px'}} />
                     <Checkbox size="l" indeterminate={true} content="size l" />
-                </p>
+                </div>
             </ShowcaseItem>
             <ShowcaseItem title="Disabled">
-                <p>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox checked={false} disabled content="unchecked" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox indeterminate={true} disabled content="indeterminate" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox checked={true} disabled content="checked" />
-                </p>
+                </div>
             </ShowcaseItem>
             <ShowcaseItem title="Uncontrolled">
-                <p>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox defaultChecked={false} content="unchecked" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox defaultChecked={true} content="checked" />
-                </p>
+                </div>
             </ShowcaseItem>
             <ShowcaseItem title="Controlled">
-                <p>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox checked={false} content="unchecked" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox indeterminate={true} content="indeterminate" />
-                </p>
-                <p>
+                </div>
+                <div style={{marginBlock: '1em'}}>
                     <Checkbox checked={true} content="checked" />
-                </p>
+                </div>
             </ShowcaseItem>
         </Showcase>
     );

diff --git a/src/components/ClipboardButton/ClipboardButton.tsx b/src/components/ClipboardButton/ClipboardButton.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 
 import {ActionTooltip} from '../ActionTooltip';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from './Button';
		export {ButtonIcon} from './ButtonIcon';