Fix Issue #1444 (#1446)

aroldo-cittati · web-flow · commit 0e0fbd2a11bf · 2025-08-08T16:28:09.000+08:00
* lint fix

* fix: prevent ref prop from being passed to extra component in ListItem

* update snapshots
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,7 +6,14 @@ module.exports = {
   rules: {
     'react-native/no-inline-styles': 0,
     semi: [1, 'never'],
-    '@typescript-eslint/no-unused-vars': [1, { args: 'none' }],
+    '@typescript-eslint/no-unused-vars': [
+      1,
+      {
+        args: 'none',
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      },
+    ],
   },
   env: {
     browser: true,
diff --git a/components/badge/index.tsx b/components/badge/index.tsx
@@ -35,7 +35,7 @@ export default class Badge extends React.Component<BadgeProps, any> {
       ...restProps // todo: hot
     } = this.props
     return (
-      <WithTheme themeStyles={BadgeStyles} styles={this.props.styles}>
+      <WithTheme themeStyles={BadgeStyles} styles={styles}>
         {(s) => {
           text =
             typeof text === 'number' && text > (overflowCount as number)
diff --git a/components/list/ListItem.tsx b/components/list/ListItem.tsx
@@ -159,10 +159,16 @@ const InternalListItem: React.ForwardRefRenderFunction<
       if (typeof extra.props.children === 'function') {
         return <AntmView style={[itemStyles.Extra]}>{extra}</AntmView>
       }
+
+      const viewProps = { ...(extra.props ?? {}) } as Record<string, any>
+      if ('ref' in viewProps) {
+        delete viewProps.ref
+      }
+
       return (
         <AntmView
           children={extra}
-          {...extra.props}
+          {...viewProps}
           style={[itemStyles.Extra, extra.props.style]}
         />
       )
diff --git a/components/modal/__tests__/__snapshots__/demo.test.js.snap b/components/modal/__tests__/__snapshots__/demo.test.js.snap
@@ -237,6 +237,7 @@ exports[`renders ./components/modal/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     >
diff --git a/components/provider/AccessibilityContext.tsx b/components/provider/AccessibilityContext.tsx
@@ -10,14 +10,15 @@ export interface AccessibilityContextProps {
   children?: React.ReactNode
 }
 
-export const AccessibilityContextProvider: React.FC<AccessibilityContextProps> =
-  ({ children, isRTL }) => {
-    const originValue = React.useContext(AccessibilityContext)
-    return (
-      <AccessibilityContext.Provider value={isRTL ?? originValue}>
-        {children}
-      </AccessibilityContext.Provider>
-    )
-  }
+export const AccessibilityContextProvider: React.FC<
+  AccessibilityContextProps
+> = ({ children, isRTL }) => {
+  const originValue = React.useContext(AccessibilityContext)
+  return (
+    <AccessibilityContext.Provider value={isRTL ?? originValue}>
+      {children}
+    </AccessibilityContext.Provider>
+  )
+}
 
 export default AccessibilityContext
diff --git a/components/search-bar/index.tsx b/components/search-bar/index.tsx
@@ -103,10 +103,8 @@ export default class SearchBar extends React.Component<
     const {
       showCancelButton,
       styles,
-      value: propsValue,
       cancelText,
-      onChangeText,
-      onChange,
+      onChange: _,
       disabled,
       style,
       ...restProps
diff --git a/components/switch/__tests__/__snapshots__/demo.test.js.snap b/components/switch/__tests__/__snapshots__/demo.test.js.snap
@@ -199,6 +199,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -423,6 +424,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -747,6 +749,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     >
@@ -921,6 +924,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     >
@@ -1108,6 +1112,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     >
@@ -1370,6 +1375,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -1565,6 +1571,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -1790,6 +1797,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -2011,6 +2019,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
diff --git a/components/tabs/Tabs.tsx b/components/tabs/Tabs.tsx
@@ -304,14 +304,14 @@ export class Tabs extends React.PureComponent<TabsProps, StateType> {
     }
   }
 
-  renderTabBar(tabBarProps: any, DefaultTabBar: React.ComponentClass) {
+  renderTabBar(tabBarProps: any, DefaultTabBarComponent: React.ComponentClass) {
     const { renderTabBar } = this.props
     if (renderTabBar === false) {
       return null
     } else if (renderTabBar) {
       return renderTabBar(tabBarProps)
     } else {
-      return <DefaultTabBar {...tabBarProps} />
+      return <DefaultTabBarComponent {...tabBarProps} />
     }
   }
 
diff --git a/components/toast/__tests__/__snapshots__/demo.test.js.snap b/components/toast/__tests__/__snapshots__/demo.test.js.snap
@@ -224,6 +224,7 @@ exports[`renders ./components/toast/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />
@@ -435,6 +436,7 @@ exports[`renders ./components/toast/demo/basic.tsx correctly 1`] = `
                           "marginLeft": 29,
                           "marginRight": 2,
                           "textAlign": "center",
+                          "zIndex": -1,
                         }
                       }
                     />

Original file line number	Diff line number	Diff line change
@@ -237,6 +237,7 @@ exports[`renders ./components/modal/demo/basic.tsx correctly 1`] = `
`237`	`237`	`"marginLeft": 29,`
`238`	`238`	`"marginRight": 2,`
`239`	`239`	`"textAlign": "center",`
	`240`	`+ "zIndex": -1,`
`240`	`241`	`}`
`241`	`242`	`}`
`242`	`243`	`>`
Original file line number	Diff line number	Diff line change
@@ -199,6 +199,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`199`	`199`	`"marginLeft": 29,`
`200`	`200`	`"marginRight": 2,`
`201`	`201`	`"textAlign": "center",`
	`202`	`+ "zIndex": -1,`
`202`	`203`	`}`
`203`	`204`	`}`
`204`	`205`	`/>`
@@ -423,6 +424,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`423`	`424`	`"marginLeft": 29,`
`424`	`425`	`"marginRight": 2,`
`425`	`426`	`"textAlign": "center",`
	`427`	`+ "zIndex": -1,`
`426`	`428`	`}`
`427`	`429`	`}`
`428`	`430`	`/>`
@@ -747,6 +749,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`747`	`749`	`"marginLeft": 29,`
`748`	`750`	`"marginRight": 2,`
`749`	`751`	`"textAlign": "center",`
	`752`	`+ "zIndex": -1,`
`750`	`753`	`}`
`751`	`754`	`}`
`752`	`755`	`>`
@@ -921,6 +924,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`921`	`924`	`"marginLeft": 29,`
`922`	`925`	`"marginRight": 2,`
`923`	`926`	`"textAlign": "center",`
	`927`	`+ "zIndex": -1,`
`924`	`928`	`}`
`925`	`929`	`}`
`926`	`930`	`>`
@@ -1108,6 +1112,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`1108`	`1112`	`"marginLeft": 29,`
`1109`	`1113`	`"marginRight": 2,`
`1110`	`1114`	`"textAlign": "center",`
	`1115`	`+ "zIndex": -1,`
`1111`	`1116`	`}`
`1112`	`1117`	`}`
`1113`	`1118`	`>`
@@ -1370,6 +1375,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`1370`	`1375`	`"marginLeft": 29,`
`1371`	`1376`	`"marginRight": 2,`
`1372`	`1377`	`"textAlign": "center",`
	`1378`	`+ "zIndex": -1,`
`1373`	`1379`	`}`
`1374`	`1380`	`}`
`1375`	`1381`	`/>`
@@ -1565,6 +1571,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`1565`	`1571`	`"marginLeft": 29,`
`1566`	`1572`	`"marginRight": 2,`
`1567`	`1573`	`"textAlign": "center",`
	`1574`	`+ "zIndex": -1,`
`1568`	`1575`	`}`
`1569`	`1576`	`}`
`1570`	`1577`	`/>`
@@ -1790,6 +1797,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`1790`	`1797`	`"marginLeft": 29,`
`1791`	`1798`	`"marginRight": 2,`
`1792`	`1799`	`"textAlign": "center",`
	`1800`	`+ "zIndex": -1,`
`1793`	`1801`	`}`
`1794`	`1802`	`}`
`1795`	`1803`	`/>`
@@ -2011,6 +2019,7 @@ exports[`renders ./components/switch/demo/basic.tsx correctly 1`] = `
`2011`	`2019`	`"marginLeft": 29,`
`2012`	`2020`	`"marginRight": 2,`
`2013`	`2021`	`"textAlign": "center",`
	`2022`	`+ "zIndex": -1,`
`2014`	`2023`	`}`
`2015`	`2024`	`}`
`2016`	`2025`	`/>`
Original file line number	Diff line number	Diff line change
`@@ -304,14 +304,14 @@ export class Tabs extends React.PureComponent<TabsProps, StateType> {`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`- renderTabBar(tabBarProps: any, DefaultTabBar: React.ComponentClass) {`
	`307`	`+ renderTabBar(tabBarProps: any, DefaultTabBarComponent: React.ComponentClass) {`
`308`	`308`	`const { renderTabBar } = this.props`
`309`	`309`	`if (renderTabBar === false) {`
`310`	`310`	`return null`
`311`	`311`	`} else if (renderTabBar) {`
`312`	`312`	`return renderTabBar(tabBarProps)`
`313`	`313`	`} else {`
`314`		`- return <DefaultTabBar {...tabBarProps} />`
	`314`	`+ return <DefaultTabBarComponent {...tabBarProps} />`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`
Original file line number	Diff line number	Diff line change
@@ -224,6 +224,7 @@ exports[`renders ./components/toast/demo/basic.tsx correctly 1`] = `
`224`	`224`	`"marginLeft": 29,`
`225`	`225`	`"marginRight": 2,`
`226`	`226`	`"textAlign": "center",`
	`227`	`+ "zIndex": -1,`
`227`	`228`	`}`
`228`	`229`	`}`
`229`	`230`	`/>`
@@ -435,6 +436,7 @@ exports[`renders ./components/toast/demo/basic.tsx correctly 1`] = `
`435`	`436`	`"marginLeft": 29,`
`436`	`437`	`"marginRight": 2,`
`437`	`438`	`"textAlign": "center",`
	`439`	`+ "zIndex": -1,`
`438`	`440`	`}`
`439`	`441`	`}`
`440`	`442`	`/>`