From aed8cd1ff213f493f6e561ec737b46f424010788 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 16 Jul 2020 22:56:20 +0800 Subject: [PATCH] fix(NumberKeyboard): flex not work on legacy safari (#6804) --- src/number-keyboard/Key.js | 7 +- src/number-keyboard/index.less | 3 - .../test/__snapshots__/demo.spec.js.snap | 316 +++++++++---- .../test/__snapshots__/index.spec.js.snap | 414 +++++++++++++----- .../test/__snapshots__/demo.spec.js.snap | 52 ++- 5 files changed, 578 insertions(+), 214 deletions(-) diff --git a/src/number-keyboard/Key.js b/src/number-keyboard/Key.js index 158aa0a57..858af2257 100644 --- a/src/number-keyboard/Key.js +++ b/src/number-keyboard/Key.js @@ -78,8 +78,9 @@ export default createComponent({ render() { return (
- +
); }, diff --git a/src/number-keyboard/index.less b/src/number-keyboard/index.less index da0cb56aa..a6dcb5805 100644 --- a/src/number-keyboard/index.less +++ b/src/number-keyboard/index.less @@ -79,13 +79,10 @@ display: flex; align-items: center; justify-content: center; - width: 100%; height: @number-keyboard-key-height; - padding: 0; font-size: @number-keyboard-key-font-size; line-height: 1.5; background-color: @white; - border: none; border-radius: @border-radius-lg; cursor: pointer; diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap index a420dbc39..8de8b1efe 100644 --- a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap @@ -41,45 +41,95 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
0
+
+
+
-
+
+
@@ -87,20 +137,44 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -110,66 +184,142 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/number-keyboard/test/__snapshots__/index.spec.js.snap b/src/number-keyboard/test/__snapshots__/index.spec.js.snap index 912ecac3d..928a45c13 100644 --- a/src/number-keyboard/test/__snapshots__/index.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/index.spec.js.snap @@ -4,20 +4,44 @@ exports[`extra-key slot 1`] = ` @@ -27,22 +51,46 @@ exports[`focus on key 1`] = ` @@ -52,22 +100,46 @@ exports[`focus on key 2`] = ` @@ -77,22 +149,46 @@ exports[`move and blur key 1`] = ` @@ -102,22 +198,46 @@ exports[`move and blur key 2`] = ` @@ -127,22 +247,46 @@ exports[`move and blur key 3`] = ` @@ -155,22 +299,46 @@ exports[`render title 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
0
+
+
+
-
+
+
@@ -181,22 +349,46 @@ exports[`title-left slot 1`] = `
Custom Title Left
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
0
+
+
+
-
+
+
diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index 52ca0fd65..ca92591da 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -19,22 +19,46 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
0
+
+
+
-
+
+