Skip to content

Commit 3cb5fe2

Browse files
committed
Merge branch 'main' into 1.4.x-dev
2 parents 1fd5778 + 6d27f1c commit 3cb5fe2

35 files changed

Lines changed: 980 additions & 259 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ test/coverage
1010
.cache
1111
packages/website-build/lib/
1212
docs/components
13+
example/ReactNativeProject/index.js

.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
node-linker=hoisted
21
registry=https://registry.npmjs.org/

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [1.4.14] - 2026-03-31
4+
- slider 组件,优化 rn 下交互
5+
6+
## [1.4.13] - 2026-03-31
7+
- checkbox-single 组件,支持 rn
8+
9+
## [1.4.12] - 2026-03-13
10+
- 新增 slider 组件,支持三端
11+
312
## [1.4.11] - 2026-02-03
413
- popup ali fix 滚动穿透问题
514

docs/guide/changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [1.4.14] - 2026-03-31
4+
- slider 组件,优化 rn 下交互
5+
6+
## [1.4.13] - 2026-03-31
7+
- checkbox-single 组件,支持 rn
8+
9+
## [1.4.12] - 2026-03-13
10+
- 新增 slider 组件,支持三端
11+
312
## [1.4.11] - 2026-02-03
413
- popup ali fix 滚动穿透问题
514

docs/guide/design-tokens.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@
2929
### color
3030
|变量名|默认值|含义|
3131
|---|---|---|
32-
|<span id="color-white" class="css-var-name">$color-white</span>|<div>#fff</div>|基础-白色|
33-
|<span id="color-black" class="css-var-name">$color-black</span>|<div>#323233</div>|基础-黑色|
34-
|<span id="color-primary" class="css-var-name">$color-primary</span>|<div>#FF7E33</div>|基础-主要颜色|
35-
|<span id="color-secondary" class="css-var-name">$color-secondary</span>|<div>#4F5E83</div>|基础-次要颜色|
36-
|<span id="color-disabled" class="css-var-name">$color-disabled</span>|<div>#ccc</div>|基础-禁用色|
37-
|<span id="color-dark-grey" class="css-var-name">$color-dark-grey</span>|<div>#333</div>|基础-灰色|
38-
|<span id="color-dark-grey-s" class="css-var-name">$color-dark-grey-s</span>|<div>#000000</div>|-|
39-
|<span id="color-light-grey-opacity" class="css-var-name">$color-light-grey-opacity</span>|<div>rgba(0, 0, 0, .04)</div>|基础-透明灰|
40-
|<span id="mask-bgc_opacity" class="css-var-name">$mask-bgc_opacity</span>|<div>rgba(37, 38, 45, 0.4)</div>|遮罩层背景|
41-
|<span id="fill-bgc" class="css-var-name">$fill-bgc</span>|<div>#f2f2f2</div>|基础-填充背景色|
42-
|<span id="opacity_active" class="css-var-name">$opacity_active</span>|<div>0.6</div>|基础-透明度|
43-
|<span id="text-color" class="css-var-name">$text-color</span>|<div><a class="css-var-default" href="#color-black">$color-black</a></div>|基础-正文、标题颜色|
44-
|<span id="text-color-desc" class="css-var-name">$text-color-desc</span>|<div>#444</div>|基础-副标题、副文案、placeholder、提示性文字颜色|
45-
|<span id="text-color-hint" class="css-var-name">$text-color-hint</span>|<div>#999</div>|基础-不希望显眼的文字(如“取消”文字按钮)颜色|
46-
|<span id="border-color-normal" class="css-var-name">$border-color-normal</span>|<div>#ebebeb</div>|基础-1px边框颜色|
32+
|<span id="color-white" class="css-var-name">--cube-color-white</span>|<div>#fff</div>|基础-白色|
33+
|<span id="color-black" class="css-var-name">--cube-color-black</span>|<div>#323233</div>|基础-黑色|
34+
|<span id="color-primary" class="css-var-name">--cube-color-primary</span>|<div>#FF7E33</div>|基础-主要颜色|
35+
|<span id="color-secondary" class="css-var-name">--cube-color-secondary</span>|<div>#4F5E83</div>|基础-次要颜色|
36+
|<span id="color-disabled" class="css-var-name">--cube-color-disabled</span>|<div>#ccc</div>|基础-禁用色|
37+
|<span id="color-dark-grey" class="css-var-name">--cube-color-dark-grey</span>|<div>#333</div>|基础-灰色|
38+
|<span id="color-dark-grey-s" class="css-var-name">--cube-color-dark-grey-s</span>|<div>#000000</div>|-|
39+
|<span id="color-light-grey-opacity" class="css-var-name">--cube-color-light-grey-opacity</span>|<div>rgba(0, 0, 0, .04)</div>|基础-透明灰|
40+
|<span id="mask-bgc_opacity" class="css-var-name">--cube-mask-bgc_opacity</span>|<div>rgba(37, 38, 45, 0.4)</div>|遮罩层背景|
41+
|<span id="fill-bgc" class="css-var-name">--cube-fill-bgc</span>|<div>#f2f2f2</div>|基础-填充背景色|
42+
|<span id="opacity_active" class="css-var-name">--cube-opacity_active</span>|<div>0.6</div>|基础-透明度|
43+
|<span id="text-color" class="css-var-name">--cube-text-color</span>|<div><a class="css-var-default" href="#color-black">--cube-color-black</a></div>|基础-正文、标题颜色|
44+
|<span id="text-color-desc" class="css-var-name">--cube-text-color-desc</span>|<div>#444</div>|基础-副标题、副文案、placeholder、提示性文字颜色|
45+
|<span id="text-color-hint" class="css-var-name">--cube-text-color-hint</span>|<div>#999</div>|基础-不希望显眼的文字(如“取消”文字按钮)颜色|
46+
|<span id="border-color-normal" class="css-var-name">--cube-border-color-normal</span>|<div>#ebebeb</div>|基础-1px边框颜色|
4747

4848

4949
</card>
@@ -54,17 +54,17 @@
5454
### size
5555
|变量名|默认值|含义|
5656
|---|---|---|
57-
|<span id="font-size-6xl" class="css-var-name">$font-size-6xl</span>|<div>30px</div>|-|
58-
|<span id="font-size-5xl" class="css-var-name">$font-size-5xl</span>|<div>28px</div>|-|
59-
|<span id="font-size-4xl" class="css-var-name">$font-size-4xl</span>|<div>26px</div>|-|
60-
|<span id="font-size-3xl" class="css-var-name">$font-size-3xl</span>|<div>24px</div>|-|
61-
|<span id="font-size-2xl" class="css-var-name">$font-size-2xl</span>|<div>22px</div>|-|
62-
|<span id="font-size-xl" class="css-var-name">$font-size-xl</span>|<div>20px</div>|-|
63-
|<span id="font-size-lg" class="css-var-name">$font-size-lg</span>|<div>18px</div>|-|
64-
|<span id="font-size-md" class="css-var-name">$font-size-md</span>|<div>16px</div>|-|
65-
|<span id="font-size-sm" class="css-var-name">$font-size-sm</span>|<div>14px</div>|-|
66-
|<span id="font-size-xs" class="css-var-name">$font-size-xs</span>|<div>12px</div>|-|
67-
|<span id="font-size-2xs" class="css-var-name">$font-size-2xs</span>|<div>10px</div>|-|
57+
|<span id="font-size-6xl" class="css-var-name">--cube-font-size-6xl</span>|<div>30px</div>|-|
58+
|<span id="font-size-5xl" class="css-var-name">--cube-font-size-5xl</span>|<div>28px</div>|-|
59+
|<span id="font-size-4xl" class="css-var-name">--cube-font-size-4xl</span>|<div>26px</div>|-|
60+
|<span id="font-size-3xl" class="css-var-name">--cube-font-size-3xl</span>|<div>24px</div>|-|
61+
|<span id="font-size-2xl" class="css-var-name">--cube-font-size-2xl</span>|<div>22px</div>|-|
62+
|<span id="font-size-xl" class="css-var-name">--cube-font-size-xl</span>|<div>20px</div>|-|
63+
|<span id="font-size-lg" class="css-var-name">--cube-font-size-lg</span>|<div>18px</div>|-|
64+
|<span id="font-size-md" class="css-var-name">--cube-font-size-md</span>|<div>16px</div>|-|
65+
|<span id="font-size-sm" class="css-var-name">--cube-font-size-sm</span>|<div>14px</div>|-|
66+
|<span id="font-size-xs" class="css-var-name">--cube-font-size-xs</span>|<div>12px</div>|-|
67+
|<span id="font-size-2xs" class="css-var-name">--cube-font-size-2xs</span>|<div>10px</div>|-|
6868

6969

7070
</card>

example/ReactNativeProject/ios/Podfile.lock

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,6 +1885,49 @@ PODS:
18851885
- ReactCommon/turbomodule/bridging
18861886
- ReactCommon/turbomodule/core
18871887
- Yoga
1888+
- RNSVG (15.8.0):
1889+
- DoubleConversion
1890+
- glog
1891+
- hermes-engine
1892+
- RCT-Folly (= 2024.11.18.00)
1893+
- RCTRequired
1894+
- RCTTypeSafety
1895+
- React-Core
1896+
- React-debug
1897+
- React-Fabric
1898+
- React-featureflags
1899+
- React-graphics
1900+
- React-ImageManager
1901+
- React-NativeModulesApple
1902+
- React-RCTFabric
1903+
- React-rendererdebug
1904+
- React-utils
1905+
- ReactCodegen
1906+
- ReactCommon/turbomodule/bridging
1907+
- ReactCommon/turbomodule/core
1908+
- RNSVG/common (= 15.8.0)
1909+
- Yoga
1910+
- RNSVG/common (15.8.0):
1911+
- DoubleConversion
1912+
- glog
1913+
- hermes-engine
1914+
- RCT-Folly (= 2024.11.18.00)
1915+
- RCTRequired
1916+
- RCTTypeSafety
1917+
- React-Core
1918+
- React-debug
1919+
- React-Fabric
1920+
- React-featureflags
1921+
- React-graphics
1922+
- React-ImageManager
1923+
- React-NativeModulesApple
1924+
- React-RCTFabric
1925+
- React-rendererdebug
1926+
- React-utils
1927+
- ReactCodegen
1928+
- ReactCommon/turbomodule/bridging
1929+
- ReactCommon/turbomodule/core
1930+
- Yoga
18881931
- SDWebImage (5.21.1):
18891932
- SDWebImage/Core (= 5.21.1)
18901933
- SDWebImage/Core (5.21.1)
@@ -1983,6 +2026,7 @@ DEPENDENCIES:
19832026
- RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
19842027
- RNReanimated (from `../node_modules/react-native-reanimated`)
19852028
- RNScreens (from `../node_modules/react-native-screens`)
2029+
- RNSVG (from `../node_modules/react-native-svg`)
19862030
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
19872031

19882032
SPEC REPOS:
@@ -2163,6 +2207,8 @@ EXTERNAL SOURCES:
21632207
:path: "../node_modules/react-native-reanimated"
21642208
RNScreens:
21652209
:path: "../node_modules/react-native-screens"
2210+
RNSVG:
2211+
:path: "../node_modules/react-native-svg"
21662212
Yoga:
21672213
:path: "../node_modules/react-native/ReactCommon/yoga"
21682214

@@ -2253,6 +2299,7 @@ SPEC CHECKSUMS:
22532299
RNReactNativeHapticFeedback: 66c6b0cf19f5d9dae8be36b2336e1fe2a2e42566
22542300
RNReanimated: 8a4ea733f88a33379150eb2e73b375e14de81e84
22552301
RNScreens: 21653ad95ea24514c81076a7af524705cd0edc21
2302+
RNSVG: 6a383145a3c76eba345cabe83d6424a2840308ca
22562303
SDWebImage: f29024626962457f3470184232766516dee8dfea
22572304
SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
22582305
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380

example/ReactNativeProject/package-lock.json

Lines changed: 148 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ReactNativeProject/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"react-native-reanimated": "3.16.7",
3636
"react-native-safe-area-context": "^4.10.9",
3737
"react-native-screens": "^4.8.0",
38+
"react-native-svg": "15.8.0",
3839
"react-native-webview": "^13.13.2"
3940
},
4041
"devDependencies": {

0 commit comments

Comments
 (0)