fix(switch): fix switch of displayName (#1983)

Co-authored-by: maxin <maxin@growingio.com>
growingio · Apr 21, 2022 · 31d03a5 · 31d03a5 · vercel · Apr 21, 2022
1 parent 6a4a3a8
commit 31d03a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/switch/Switch.tsx b/src/switch/Switch.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import classnames from 'classnames';
-import { isUndefined } from 'lodash';
+import { get, isUndefined } from 'lodash';
 import { usePrefixCls } from '@gio-design/utils';
 import usePrevious from '../utils/hooks/usePrevious';
 import filterChildren from '../utils/filterChildren';
@@ -36,7 +36,7 @@ const Switch = React.forwardRef<HTMLDivElement, SwitchProps>((props: SwitchProps
   const getChildrenItems = () =>
     filterChildren(children, (child) => {
       if (React.isValidElement(child)) {
-        if (typeof child.type !== 'object' || (child.type as typeof SwitchItem).displayName !== 'Switch') {
+        if (typeof child.type !== 'object' || get(child, 'type.displayName') !== SwitchItem.displayName) {
           return false;
         }
         if (!Reflect.has(child.props, 'value')) {

diff --git a/src/switch/demo/Switch.stories.tsx b/src/switch/demo/Switch.stories.tsx
@@ -328,7 +328,7 @@ const JSXTemplateGroup: Story<SwitchProps> = (args) => {
     <>
       <Switch {...args} size="normal" value={selectedValue} onChange={onChange}>
         {tabs.map((t) => (
-          <Switch.Item value={t.value} prefix={<PushMsgFilled />}>
+          <Switch.Item value={t.value} key={t.key} prefix={<PushMsgFilled />}>
             {t.value}
           </Switch.Item>
         ))}