@varlet/ui 2.8.5-alpha.1677518578668 → 2.8.5

package/highlight/web-types.en-US.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "2.8.5-alpha.1677518578668",
+  "version": "2.8.5",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -1530,6 +1530,24 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "justify",
+              "description": "Main axis arrangement, Can be set to `flex-start` `flex-end` `center` `space-around` `space-between`",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "align",
+              "description": "Cross axis arrangement, Can be set to `stretch` `center` `flex-start` `flex-end` `baseline`",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "xs",
               "description": "`<768px` Responsive columns or column props object",
@@ -5172,9 +5190,9 @@
           "name": "var-space",
           "attributes": [
             {
-              "name": "align",
-              "description": "Vertical arrangement, Can be set to `stretch` `center` `start` `end` `baseline`",
-              "default": "-",
+              "name": "direction",
+              "description": "Layout direction, Can be set to `row` `column`",
+              "default": "row",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -5182,8 +5200,17 @@
             },
             {
               "name": "justify",
-              "description": "Horizontal arrangement, Can be set to `start` `end` `center` `space-around` `space-between`",
-              "default": "start",
+              "description": "Main axis arrangement, Can be set to `flex-start` `flex-end` `center` `space-around` `space-between`",
+              "default": "flex-start",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "align",
+              "description": "Cross axis arrangement, Can be set to `stretch` `center` `flex-start` `flex-end` `baseline`",
+              "default": "-",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -5207,15 +5234,6 @@
                 "kind": "expression"
               }
             },
-            {
-              "name": "direction",
-              "description": "Layout direction, Can be set to `row` `column`",
-              "default": "row",
-              "value": {
-                "type": "string",
-                "kind": "expression"
-              }
-            },
             {
               "name": "inline",
               "description": "Is it an inline element",

package/highlight/web-types.zh-CN.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "2.8.5-alpha.1677518578668",
+  "version": "2.8.5",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -1590,6 +1590,24 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "justify",
+              "description": "主轴排列方式 可选值为 `flex-start` `flex-end` `center` `space-around` `space-between`",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "align",
+              "description": "交叉轴排列方式 可选值为 `stretch` `center` `flex-start` `flex-end` `baseline`",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "xs",
               "description": "`<768px` 响应式栅格数或者栅格属性对象",
@@ -5390,9 +5408,9 @@
           "name": "var-space",
           "attributes": [
             {
-              "name": "align",
-              "description": "垂直排列方式 可选值为 `stretch` `center` `start` `end` `baseline`",
-              "default": "-",
+              "name": "direction",
+              "description": "布局方向 可选值为 `row` `column`",
+              "default": "row",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -5400,8 +5418,17 @@
             },
             {
               "name": "justify",
-              "description": "水平排列方式 可选值为 `start` `end` `center` `space-around` `space-between`",
-              "default": "start",
+              "description": "主轴排列方式 可选值为 `flex-start` `flex-end` `center` `space-around` `space-between`",
+              "default": "flex-start",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "align",
+              "description": "交叉轴排列方式 可选值为 `stretch` `center` `flex-start` `flex-end` `baseline`",
+              "default": "-",
               "value": {
                 "type": "string",
                 "kind": "expression"
@@ -5425,15 +5452,6 @@
                 "kind": "expression"
               }
             },
-            {
-              "name": "direction",
-              "description": "布局方向 可选值为 `row` `column`",
-              "default": "row",
-              "value": {
-                "type": "string",
-                "kind": "expression"
-              }
-            },
             {
               "name": "inline",
               "description": "是否为行内元素",

package/lib/varlet.cjs.js

@@ -372,6 +372,9 @@ function supportTouch() {
   var inBrowser2 = typeof window !== "undefined";
   return inBrowser2 && "ontouchstart" in window;
 }
+function padStartFlex(style) {
+  return style === "start" || style === "end" ? "flex-" + style : style;
+}
 var _excluded = ["collect", "clear"];
 function asyncGeneratorStep$d(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -5206,6 +5209,12 @@ var _ChipComponent = Chip;
 function directionValidator$3(direction) {
   return ["row", "column"].includes(direction);
 }
+function justifyValidator$2(justify) {
+  return ["start", "end", "center", "space-around", "space-between", "flex-start", "flex-end"].includes(justify);
+}
+function alignValidator$2(align) {
+  return ["stretch", "center", "start", "end", "baseline", "initial", "inherit", "flex-start", "flex-end"].includes(align);
+}
 var props$O = {
   span: {
     type: [String, Number],
@@ -5220,6 +5229,14 @@ var props$O = {
     default: "row",
     validator: directionValidator$3
   },
+  justify: {
+    type: String,
+    validator: justifyValidator$2
+  },
+  align: {
+    type: String,
+    validator: alignValidator$2
+  },
   xs: {
     type: [Object, Number, String]
   },
@@ -5281,6 +5298,8 @@ function __render__$W(_ctx, _cache) {
       class: vue.normalizeClass(_ctx.classes(_ctx.n(), _ctx.n("$--box"), [_ctx.span >= 0, _ctx.n("--span-" + _ctx.span)], [_ctx.offset, _ctx.n("--offset-" + _ctx.offset)], ..._ctx.getSize("xs", _ctx.xs), ..._ctx.getSize("sm", _ctx.sm), ..._ctx.getSize("md", _ctx.md), ..._ctx.getSize("lg", _ctx.lg), ..._ctx.getSize("xl", _ctx.xl))),
       style: vue.normalizeStyle({
         flexDirection: _ctx.direction,
+        justifyContent: _ctx.padStartFlex(_ctx.justify),
+        alignItems: _ctx.padStartFlex(_ctx.align),
         paddingLeft: _ctx.toSizeUnit(_ctx.padding.left),
         paddingRight: _ctx.toSizeUnit(_ctx.padding.right)
       }),
@@ -5345,7 +5364,8 @@ var __sfc__$X = vue.defineComponent({
       getSize,
       span,
       offset: offset2,
-      handleClick
+      handleClick,
+      padStartFlex
     };
   }
 });
@@ -19118,10 +19138,10 @@ Result.install = function(app) {
 };
 var _ResultComponent = Result;
 function justifyValidator$1(justify) {
-  return ["flex-start", "flex-end", "center", "space-between", "space-around"].includes(justify);
+  return ["flex-start", "flex-end", "start", "end", "center", "space-between", "space-around"].includes(justify);
 }
-function alignValidator(align) {
-  return ["flex-start", "center", "flex-end"].includes(align);
+function alignValidator$1(align) {
+  return ["flex-start", "center", "flex-end", "start", "end"].includes(align);
 }
 var props$g = {
   gutter: {
@@ -19136,7 +19156,7 @@ var props$g = {
   align: {
     type: String,
     default: "flex-start",
-    validator: alignValidator
+    validator: alignValidator$1
   },
   onClick: defineListenerProp()
 };
@@ -19150,8 +19170,8 @@ function __render__$g(_ctx, _cache) {
     {
       class: vue.normalizeClass(_ctx.classes(_ctx.n(), _ctx.n("$--box"))),
       style: vue.normalizeStyle({
-        justifyContent: _ctx.justify,
-        alignItems: _ctx.align,
+        justifyContent: _ctx.padStartFlex(_ctx.justify),
+        alignItems: _ctx.padStartFlex(_ctx.align),
         margin: _ctx.average ? "0 -" + _ctx.average + "px" : void 0
       }),
       onClick: _cache[0] || (_cache[0] = function() {
@@ -19197,7 +19217,8 @@ var __sfc__$h = vue.defineComponent({
       n: n$i,
       classes: classes$e,
       average,
-      handleClick
+      handleClick,
+      padStartFlex
     };
   }
 });
@@ -21054,12 +21075,12 @@ var sizeValidator = (size) => {
   return internalSizeValidator(size) || isArray(size) || isNumber(size) || isString(size);
 };
 var justifyValidator = (justify) => {
-  return ["start", "end", "center", "space-around", "space-between"].includes(justify);
+  return ["start", "end", "center", "space-around", "space-between", "flex-start", "flex-end"].includes(justify);
+};
+var alignValidator = (align) => {
+  return ["stretch", "center", "start", "end", "baseline", "flex-start", "flex-end"].includes(align);
 };
 var props$b = {
-  align: {
-    type: String
-  },
   size: {
     type: [String, Number, Array],
     default: "normal",
@@ -21075,9 +21096,13 @@ var props$b = {
   },
   justify: {
     type: String,
-    default: "start",
+    default: "flex-start",
     validator: justifyValidator
   },
+  align: {
+    type: String,
+    validator: alignValidator
+  },
   inline: {
     type: Boolean,
     default: false
@@ -21095,7 +21120,7 @@ function computeMargin(y, x, options) {
   } = options;
   var margin = "0";
   if (direction === "row") {
-    if (justify === "start" || justify === "center" || justify === "end") {
+    if (["flex-start", "center", "flex-end", "start", "end"].includes(justify)) {
       if (index !== lastIndex) {
         margin = half(y) + " " + x + " " + half(y) + " 0";
       } else {
@@ -21132,9 +21157,6 @@ const Space = vue.defineComponent({
     var getSize = (size, isInternalSize) => {
       return isInternalSize ? ["var(--space-size-" + size + "-y)", "var(--space-size-" + size + "-x)"] : isArray(size) ? size.map(toSizeUnit) : [toSizeUnit(size), toSizeUnit(size)];
     };
-    var padStartFlex = (style) => {
-      return style === "start" || style === "end" ? "flex-" + style : style;
-    };
     return () => {
       var _call;
       var {
@@ -24326,9 +24348,9 @@ const skeleton = "";
 const SkeletonSfc = "";
 const slider = "";
 const SliderSfc = "";
+const SnackbarSfc = "";
 const snackbar = "";
 const coreSfc = "";
-const SnackbarSfc = "";
 const space = "";
 const step = "";
 const StepSfc = "";
@@ -24353,7 +24375,7 @@ const TimePickerSfc = "";
 const TooltipSfc = "";
 const uploader = "";
 const UploaderSfc = "";
-const version = "2.8.5-alpha.1677518578668";
+const version = "2.8.5";
 function install(app) {
   ActionSheet.install && app.use(ActionSheet);
   AppBar.install && app.use(AppBar);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "2.8.5-alpha.1677518578668",
+  "version": "2.8.5",
   "description": "A material like components library",
   "main": "lib/varlet.cjs.js",
   "module": "es/index.mjs",
@@ -46,8 +46,8 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/icons": "2.8.5-alpha.1677518578668",
-    "@varlet/shared": "2.8.5-alpha.1677518578668"
+    "@varlet/icons": "2.8.5",
+    "@varlet/shared": "2.8.5"
   },
   "devDependencies": {
     "@types/jest": "^26.0.15",
@@ -62,8 +62,8 @@
     "typescript": "^4.4.4",
     "vue": "3.2.25",
     "vue-router": "4.0.12",
-    "@varlet/cli": "2.8.5-alpha.1677518578668",
-    "@varlet/touch-emulator": "2.8.5-alpha.1677518578668"
+    "@varlet/cli": "2.8.5",
+    "@varlet/touch-emulator": "2.8.5"
   },
   "browserslist": [
     "Chrome >= 54",

package/types/col.d.ts

@@ -8,12 +8,27 @@ export type ColSizeDescriptor = {
   offset?: number | string
 }
 
+export type ColAlign =
+  | 'stretch'
+  | 'center'
+  | 'start'
+  | 'end'
+  | 'baseline'
+  | 'initial'
+  | 'inherit'
+  | 'flex-start'
+  | 'flex-end'
+
+export type ColJustify = 'start' | 'end' | 'center' | 'space-around' | 'space-between' | 'flex-start' | 'flex-end'
+
 export type ColDirection = 'row' | 'column'
 
 export interface ColProps extends BasicAttributes {
   span?: string | number
   offset?: string | number
   direction?: ColDirection
+  justify?: ColJustify
+  align?: ColAlign
   xs?: string | number | ColSizeDescriptor | undefined
   sm?: string | number | ColSizeDescriptor | undefined
   md?: string | number | ColSizeDescriptor | undefined

package/types/row.d.ts

@@ -3,9 +3,9 @@ import { VNode } from 'vue'
 
 export declare const rowProps: Record<string, any>
 
-export type RowJustify = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around'
+export type RowJustify = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'start' | 'end'
 
-export type RowAlign = 'flex-start' | 'center' | 'flex-end'
+export type RowAlign = 'flex-start' | 'center' | 'flex-end' | 'start' | 'end'
 
 export interface RowProps extends BasicAttributes {
   gutter?: string | number

package/types/space.d.ts

@@ -3,11 +3,11 @@ import { VNode } from 'vue'
 
 export declare const spaceProps: Record<string, any>
 
-export type SpaceAlign = 'stretch' | 'center' | 'start' | 'end' | 'baseline' | 'initial' | 'inherit'
+export type SpaceAlign = 'stretch' | 'center' | 'start' | 'end' | 'baseline' | 'flex-start' | 'flex-end'
 
 export type SpaceDirection = 'row' | 'column'
 
-export type SpaceJustify = 'start' | 'end' | 'center' | 'space-around' | 'space-between'
+export type SpaceJustify = 'start' | 'end' | 'center' | 'space-around' | 'space-between' | 'flex-start' | 'flex-end'
 
 export type SpaceInternalSize = 'mini' | 'small' | 'normal' | 'large'