fix(Input): supplement default value for cursor-color attr (#3272)

* fix(Input): supplement default value for cursor-color attr * test: update snapshots
Tencent · Nov 12, 2024 · 79a7789 · 79a7789
1 parent b193a61
commit 79a7789
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -1,4 +1,3 @@
-import exp from 'constants';
 import { prefix } from './config';
 import { getWindowInfo, getAppBaseInfo, getDeviceInfo } from './wechat';
 
@@ -129,6 +128,10 @@ export const isDef = function (value: any): boolean {
   return !isUndefined(value) && !isNull(value);
 };
 
+export const isIOS = function (): boolean {
+  return !!(deviceInfo?.system?.toLowerCase().search('ios') + 1);
+};
+
 export const addUnit = function (value?: string | number): string | undefined {
   if (!isDef(value)) {
     return undefined;

diff --git a/src/input/__test__/__snapshots__/index.test.js.snap b/src/input/__test__/__snapshots__/index.test.js.snap
@@ -39,7 +39,7 @@ exports[`input props : clearable && label && suffix 1`] = `
           confirmHold="{{false}}"
           confirmType="done"
           cursor="{{0}}"
-          cursorColor=""
+          cursorColor="#0052d9"
           cursorSpacing="{{0}}"
           disabled="{{null}}"
           focus="{{false}}"
@@ -174,7 +174,7 @@ exports[`input slots : label 1`] = `
           confirmHold="{{false}}"
           confirmType="done"
           cursor="{{0}}"
-          cursorColor=""
+          cursorColor="#0052d9"
           cursorSpacing="{{0}}"
           disabled="{{null}}"
           focus="{{false}}"

diff --git a/src/input/input.ts b/src/input/input.ts
@@ -1,7 +1,7 @@
 import { SuperComponent, wxComponent } from '../common/src/index';
 import config from '../common/config';
 import props from './props';
-import { getCharacterLength, calcIcon, isDef } from '../common/utils';
+import { getCharacterLength, calcIcon, isDef, isIOS } from '../common/utils';
 
 const { prefix } = config;
 const name = `${prefix}-input`;
@@ -32,6 +32,7 @@ export default class Input extends SuperComponent {
     classPrefix: name,
     classBasePrefix: prefix,
     showClearIcon: true,
+    defaultCursorColor: isIOS() ? '#0052d9' : 'default',
   };
 
   lifetimes = {

diff --git a/src/input/input.wxml b/src/input/input.wxml
@@ -39,7 +39,7 @@
         confirm-type="{{confirmType}}"
         confirm-hold="{{confirmHold}}"
         cursor="{{cursor}}"
-        cursor-color="{{cursorColor}}"
+        cursor-color="{{cursorColor || defaultCursorColor}}"
         cursor-spacing="{{cursorSpacing}}"
         adjust-position="{{adjustPosition}}"
         auto-focus="{{autoFocus}}"