feat: the prop direction support four directions: top, bottom, left, right. fix #1181

README.md

@@ -68,7 +68,7 @@ import 'zarm/dist/zarm.css';
 
 | 问题上报                                                    | 讨论交流                                                              | 微信群                                                                                                     |
 | :---------------------------------------------------------- | :-------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------- |
-| [github issues](https://github.com/ZhongAnTech/zarm/issues) | [github discussions](https://github.com/ZhongAnTech/zarm/discussions) | <img src="https://cdn-health.zhongan.com/zarm/qrcode.jpg" width="80" /> <br />备注 "zarm" 加好友后邀请进群 |
+| [github issues](https://github.com/ZhongAnTech/zarm/issues) | [github discussions](https://github.com/ZhongAnTech/zarm/discussions) | <img src="https://cdn-health.zhongan.com/zarm/qrcode.jpg" width="80" /> <br />备注 "zarm github" 加好友后邀请进群 |
 
 ## 如何贡献
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "packages": ["packages/*"],
+  "workspaces": ["packages/*"],
   "version": "independent",
   "command": {
     "publish": {

packages/bem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zarm-design/bem",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "bem struct",
   "keywords": [
     "bem",

packages/site/demo/styles/CalendarPage.scss

@@ -30,3 +30,9 @@
     }
   }
 }
+
+.za-calendar__day--selected {
+  .custom__text {
+    color: var(--day-selected-background);
+  }
+}

packages/site/demo/styles/TabsPage.scss

@@ -1,25 +1,15 @@
 @import '@/styles/index';
 
 .tabs-page {
-  .za-tabs + .za-tabs {
-    margin-top: r(10);
-  }
-
   .content {
-    display: flex;
-    align-items: center;
-    justify-content: center;
     padding: r(10);
-    height: r(150);
   }
 
-  .za-tabs--vertical {
-    .content {
-      height: 100%;
-    }
+  .custom-width {
+    width: r(250);
+  }
 
-    &.custom-height {
-      height: r(200);
-    }
+  .custom-height {
+    height: r(200);
   }
 }

packages/site/package.json

@@ -1,11 +1,11 @@
 {
   "name": "site",
-  "version": "0.0.22",
+  "version": "0.0.31",
   "private": true,
   "scripts": {
     "build": "rimraf assets && mkdir assets && touch assets/CNAME && echo 'zarm.design' > assets/CNAME && zarm deploy",
     "clean": "rimraf assets",
-    "deploy": "yarn build -p && gh-pages -d assets",
+    "deploy": "yarn build && gh-pages -d assets",
     "start": "zarm dev"
   },
   "browserslist": [
@@ -17,7 +17,7 @@
     "Android >= 4"
   ],
   "dependencies": {
-    "@zarm-design/icons": "^0.1.13",
+    "@zarm-design/icons": "^0.1.15",
     "antd": "^5.0.7",
     "classnames": "2.2.6",
     "clipboard": "^2.0.11",
@@ -28,12 +28,12 @@
     "react-intl": "^5.12.1",
     "react-loadable": "^5.5.0",
     "react-router-dom": "^5.1.2",
-    "zarm": "^3.0.14",
+    "zarm": "^3.1.4",
     "zarm-web": "0.0.1-alpha.13"
   },
   "devDependencies": {
     "@babel/standalone": "7.12.15",
-    "@sentry/browser": "^5.30.0",
+    "@sentry/browser": "^7.119.1",
     "@types/classnames": "^2.2.3",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
@@ -45,7 +45,7 @@
     "codesandbox": "^2.2.3",
     "core-js": "^3.12.1",
     "docsearch.js": "^2.6.1",
-    "gh-pages": "^3.1.0",
+    "gh-pages": "^5.0.0",
     "history": "^5.0.0",
     "marked": "^4.0.10",
     "prismjs": "^1.23.0",

packages/zarm-icons/package.json

@@ -1,15 +1,25 @@
 {
   "name": "@zarm-design/icons",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "",
   "license": "MIT",
   "author": "jerome.lin@zhongan.com",
   "exports": {
-    ".": "./lib/index.js",
-    "./style": "./lib/style/index.scss",
-    "./style/font": "./lib/font/style/icon.scss"
+    ".": {
+      "import": "./es/index.js",
+      "default": "./lib/index.js"
+    },
+    "./style": {
+      "import": "./es/style/index.scss",
+      "default": "./lib/style/index.scss"
+    },
+    "./style/font": {
+      "import": "./es/font/style/icon.scss",
+      "default": "./lib/font/style/icon.scss"
+    }
   },
   "main": "lib/index.js",
+  "module": "es/index.js",
   "typings": "lib/index.d.ts",
   "files": [
     "es",
@@ -19,8 +29,8 @@
   "scripts": {
     "build": "yarn build:lib && yarn build:es",
     "build:es": "rimraf es && tsc --outDir es && zarm build --mode es --path src --out-dir es --copy-files --build-css",
-    "build:lib": "rimraf lib && tsc --outDir lib && zarm build --mode lib --path src --out-dir lib --copy-files --build-css",
     "build:font": "webFontsHelper --src ./svg --fontName zaicon --fontPath src/font --className za-icon",
+    "build:lib": "rimraf lib && tsc --outDir lib && zarm build --mode lib --path src --out-dir lib --copy-files --build-css",
     "build:react": "rimraf src/react && svgr ./svg --out-dir ./src/react",
     "build:svg": "rimraf svg && node ./scripts/exportSVG.js",
     "clean": "rimraf lib es coverage svg",
@@ -29,7 +39,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0",
-    "@zarm-design/bem": "^0.0.8",
+    "@zarm-design/bem": "^0.0.9",
     "change-case": "^4.1.2"
   },
   "devDependencies": {
@@ -42,6 +52,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "modules": "es/index.js"
+  }
 }

packages/zarm/CHANGELOG.md

@@ -1,14 +1,75 @@
 # 版本更新日志
 
-## v3.0.14
+## v3.1.4
+
+- Perf
+
+  - [Popup] 支持嵌套使用 [#d94776](https://github.com/ZhongAnTech/zarm/commit/d94776d4762282c3ecc43ffbcd11b75d71fcc5fb)
+
+## v3.1.2
 
 - Bug Fix
 
-  - [PickerView] 修复文字过长截断失效的bug。[#1097](https://github.com/ZhongAnTech/zarm/pull/1097)
-  - [DatePicker] 修复值不能重置为 `undefined` 的bug。[#1100](https://github.com/ZhongAnTech/zarm/pull/1100)[@aiyogg]
+  - [Carousel] 修复图片大小计算偏差问题 [#1169](https://github.com/ZhongAnTech/zarm/pull/1169) [@zyf-xcode]
+
+## v3.1.1
+
+- Perf
+
+  - [Popup] onMaskClick 事件支持原生 event 参数 [#1168](https://github.com/ZhongAnTech/zarm/pull/1168)
+
+## v3.1.0
+
+- Bug Fix
+
+  - [Toast] 修复单独使用该组件 loading 模式时样式丢失的情况 [#1163](https://github.com/ZhongAnTech/zarm/pull/1163)
+
+  - [@zarm-design/icons] 修复当前图标库的导出配置会导致使用 ES 模块时引用 lib 而不是引用 es 下的资源，从而导致 tree shake 失败 [#1166](https://github.com/ZhongAnTech/zarm/pull/1166)
+
+## v3.0.17
+
+- Bug Fix
+
+  - [Popup] 修复内容中包含 transtion 动画时，会影响 Popup 的动画的执行 [#1153](https://github.com/ZhongAnTech/zarm/pull/1153)
+
+- Perf
+
+  - [Calendar] 优化初始状态下自动滑动到已选择的日期位置 [#1150](https://github.com/ZhongAnTech/zarm/pull/1150)
 
-  - [Popup] 修复 `maskClassName` 属性名错误的bug。[#1102](https://github.com/ZhongAnTech/zarm/pull/1102)[@aiyogg]
+## v3.0.16
+
+- Bug Fix
+
+  - [@zarm-design/icons] 修复 ES Module 模块无法导出的问题 [#5e5c8f](https://github.com/ZhongAnTech/zarm/commit/5e5c8f125c1dc721ed6df8a9ae39462bd8c9a4db)
+  - [Calendar] 修复最大/小可选日期设置后展示不正确的问题 [#1149](https://github.com/ZhongAnTech/zarm/pull/1149)
+
+- Perf
+
+  - [Calendar] `dateRender` 增加 `value` 参数露出，优化样式 css 变量 [#1148](https://github.com/ZhongAnTech/zarm/pull/1148)
+
+## v3.0.15
+
+- Bug Fix
+
+  - [DatePicker] 修复默认值重置为 `undefined` 失效的 bug [#1113](https://github.com/ZhongAnTech/zarm/pull/1113)
+  - [CustomInput] 修复只读状态样式问题 [#1117](https://github.com/ZhongAnTech/zarm/pull/1117)
+  - [Popup, Modal] 修复内容超长无法滚动问题 [#1145](https://github.com/ZhongAnTech/zarm/pull/1145)
+
+- Break Change
+
+  - [TabBar] 移除弃用的 `visible` 和 `safeArea` 属性 [#1112](https://github.com/ZhongAnTech/zarm/pull/1112) [#8db25c](https://github.com/ZhongAnTech/zarm/commit/8db25cc191fa41d1d13f8308ef94787de61b9f2e)
+
+- Perf
+
+  - [Badge] 字体样式优化 [#1118](https://github.com/ZhongAnTech/zarm/pull/1118)
+
+## v3.0.14
+
+- Bug Fix
 
+  - [PickerView] 修复文字过长截断失效的 bug。[#1097](https://github.com/ZhongAnTech/zarm/pull/1097)
+  - [DatePicker] 修复值不能重置为 `undefined` 的 bug。[#1100](https://github.com/ZhongAnTech/zarm/pull/1100)[@aiyogg]
+  - [Popup] 修复 `maskClassName` 属性名错误的 bug。[#1102](https://github.com/ZhongAnTech/zarm/pull/1102)[@aiyogg]
 
 - Perf
 

packages/zarm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarm",
-  "version": "3.0.14",
+  "version": "3.1.4",
   "description": "基于 React 的移动端UI库",
   "keywords": [
     "react",
@@ -67,8 +67,8 @@
   "dependencies": {
     "@floating-ui/react-dom-interactions": "^0.9.1",
     "@use-gesture/react": "^10.1.1",
-    "@zarm-design/bem": "^0.0.8",
-    "@zarm-design/icons": "^0.1.13",
+    "@zarm-design/bem": "^0.0.9",
+    "@zarm-design/icons": "^0.1.15",
     "ahooks": "^3.7.6",
     "better-scroll": "2.3.1",
     "classnames": "^2.3.1",

packages/zarm/src/action-sheet/interface.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import type { MountContainer } from '../utils/dom';
 import type { Locale } from '../config-provider/interface';
+import type { PopupProps } from '../popup';
+import type { MountContainer } from '../utils/dom';
 
 export interface BaseActionSheetItemProps {
   key?: string | number;
@@ -15,7 +16,7 @@ export interface BaseActionSheetProps {
   visible?: boolean;
   spacing?: boolean;
   cancelText?: string;
-  onMaskClick?: () => void;
+  onMaskClick?: PopupProps['onMaskClick'];
   onCancel?: () => void;
   afterClose?: () => void;
   destroy?: boolean;