From 91d014b6302a204fd626ca6bac45226035f82e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Mon, 26 Dec 2022 22:58:54 +0800 Subject: [PATCH 1/2] docs: update demo --- components/checkbox/demo/debug-disable-popover.md | 7 +++++++ components/checkbox/demo/debug-disable-popover.tsx | 12 ++++++++++++ components/checkbox/index.en-US.md | 1 + components/checkbox/index.zh-CN.md | 1 + components/checkbox/style/index.tsx | 3 +++ 5 files changed, 24 insertions(+) create mode 100644 components/checkbox/demo/debug-disable-popover.md create mode 100644 components/checkbox/demo/debug-disable-popover.tsx diff --git a/components/checkbox/demo/debug-disable-popover.md b/components/checkbox/demo/debug-disable-popover.md new file mode 100644 index 000000000000..7b16d5a442a1 --- /dev/null +++ b/components/checkbox/demo/debug-disable-popover.md @@ -0,0 +1,7 @@ +## zh-CN + +禁用时鼠标进入、离开触发 Tooltip + +## en-US + +Disable to show/hide Tooltip diff --git a/components/checkbox/demo/debug-disable-popover.tsx b/components/checkbox/demo/debug-disable-popover.tsx new file mode 100644 index 000000000000..67dd733fe2c2 --- /dev/null +++ b/components/checkbox/demo/debug-disable-popover.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import { Checkbox, Popover } from 'antd'; + +const App: React.FC = () => ( +
+ + + +
+); + +export default App; diff --git a/components/checkbox/index.en-US.md b/components/checkbox/index.en-US.md index 947328a2586c..989c2ca2faa4 100644 --- a/components/checkbox/index.en-US.md +++ b/components/checkbox/index.en-US.md @@ -24,6 +24,7 @@ Checkbox component. Check all Use with Grid Same line +Disabled to show Tooltip ## API diff --git a/components/checkbox/index.zh-CN.md b/components/checkbox/index.zh-CN.md index c0ceaf5101d5..b56eb0c49585 100644 --- a/components/checkbox/index.zh-CN.md +++ b/components/checkbox/index.zh-CN.md @@ -25,6 +25,7 @@ demo: 全选 布局 同行布局 +禁用下的 Tooltip ## API diff --git a/components/checkbox/style/index.tsx b/components/checkbox/style/index.tsx index f1a32f59df7a..8c764b68266e 100644 --- a/components/checkbox/style/index.tsx +++ b/components/checkbox/style/index.tsx @@ -246,6 +246,9 @@ export const genCheckboxStyle: GenerateStyle = (token) => { // Wrapper > Checkbox > input [`&, ${checkboxCls}-input`]: { cursor: 'not-allowed', + // Disabled for native input to enable Tooltip event handler + // ref: https://github.com/ant-design/ant-design/issues/39822#issuecomment-1365075901 + pointerEvents: 'none', }, // Wrapper > Checkbox > inner From d31c325d95b6831c9283588301150818e17fd77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Mon, 26 Dec 2022 23:02:16 +0800 Subject: [PATCH 2/2] test: Update snapshot --- .../__snapshots__/demo-extend.test.ts.snap | 52 +++++++++++++++++++ .../__tests__/__snapshots__/demo.test.ts.snap | 24 +++++++++ 2 files changed, 76 insertions(+) diff --git a/components/checkbox/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/checkbox/__tests__/__snapshots__/demo-extend.test.ts.snap index 2aefd29f4685..4f3000184013 100644 --- a/components/checkbox/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/checkbox/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -159,6 +159,58 @@ Array [ ] `; +exports[`renders ./components/checkbox/demo/debug-disable-popover.tsx extend context correctly 1`] = ` +
+ +
+
+
+
+ +
+ +
+
+
+
+`; + exports[`renders ./components/checkbox/demo/debug-line.tsx extend context correctly 1`] = `
+ +
+`; + exports[`renders ./components/checkbox/demo/debug-line.tsx correctly 1`] = `