@hi-ui/grid 4.0.0-beta.14 → 4.0.0-beta.17

package/lib/cjs/Grid.js

@@ -25,7 +25,7 @@ var env = require('@hi-ui/env');
 
 var context = require('./context.js');
 
-var index = require('./utils/type-assertion/lib/esm/index.js');
+var typeAssertion = require('@hi-ui/type-assertion');
 
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
@@ -68,7 +68,7 @@ var Row = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       return gutterProp ? DEFAULT_GUTTER_GAP : 0;
     }
 
-    if (index.isNumeric(gutterProp)) {
+    if (typeAssertion.isNumeric(gutterProp)) {
       var gap = Number(gutterProp);
 
       if (gap < 0) {
@@ -130,8 +130,8 @@ var Col = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       columns = _useGridContext$colum === void 0 ? 24 : _useGridContext$colum; // 需要 warning 不合法
 
 
-  var span = index.isNumeric(spanProp) && spanProp >= 0 && spanProp <= columns ? spanProp : null;
-  var offset = index.isNumeric(offsetProp) && offsetProp >= 0 && offsetProp < columns ? offsetProp : 0;
+  var span = typeAssertion.isNumeric(spanProp) && spanProp >= 0 && spanProp <= columns ? spanProp : null;
+  var offset = typeAssertion.isNumeric(offsetProp) && offsetProp >= 0 && offsetProp < columns ? offsetProp : 0;
   var style = Object.assign(justifyContent ? Object.assign(Object.assign({}, styleProp), {
     display: 'flex',
     justifyContent: justifyContent
@@ -148,34 +148,5 @@ if (env.__DEV__) {
   Col.displayName = 'Col';
 }
 
-var brPrefix = classname.getPrefixCls('grid-br');
-/**
- * TODO: What is Grid Br
- */
-
-var Br = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  var _a$prefixCls3 = _a.prefixCls,
-      prefixCls = _a$prefixCls3 === void 0 ? brPrefix : _a$prefixCls3,
-      className = _a.className,
-      styleProp = _a.style,
-      height = _a.height,
-      rest = tslib.__rest(_a, ["prefixCls", "className", "style", "height"]);
-
-  var cls = classname.cx(prefixCls, className);
-  var style = height ? Object.assign(Object.assign({}, styleProp), {
-    height: height
-  }) : styleProp;
-  return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
-    ref: ref,
-    className: cls,
-    style: style
-  }, rest));
-});
-
-if (env.__DEV__) {
-  Br.displayName = 'Br';
-}
-
-exports.Br = Br;
 exports.Col = Col;
 exports.Row = Row;

package/lib/cjs/index.js

@@ -19,10 +19,8 @@ var Grid$1 = require('./Grid.js');
 
 var Grid = {
   Row: Grid$1.Row,
-  Col: Grid$1.Col,
-  Br: Grid$1.Br
+  Col: Grid$1.Col
 };
-exports.Br = Grid$1.Br;
 exports.Col = Grid$1.Col;
 exports.Row = Grid$1.Row;
 exports["default"] = Grid;

package/lib/cjs/styles/index.scss.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, '__esModule', {
 });
 var css_248z = ".hi-v4-grid-row {position: relative;-webkit-box-sizing: border-box;box-sizing: border-box;display: -webkit-box;display: -ms-flexbox;display: flex;-ms-flex-wrap: wrap;flex-wrap: wrap;row-gap: var(--hi-v4-grid-row-gap);margin-left: calc(-1 * var(--hi-v4-grid-row-gutter) / 2);margin-right: calc(-1 * var(--hi-v4-grid-row-gutter) / 2); }.hi-v4-grid-row + .hi-v4-grid-row {margin-top: var(--hi-v4-grid-row-gap); }.hi-v4-grid-col {-webkit-box-sizing: border-box;box-sizing: border-box;-webkit-box-flex: 0;-ms-flex-positive: 0;flex-grow: 0;-ms-flex-negative: 0;flex-shrink: 0;-ms-flex-preferred-size: var(--hi-v4-grid-col-span);flex-basis: var(--hi-v4-grid-col-span);max-width: var(--hi-v4-grid-col-span);margin-left: var(--hi-v4-grid-col-offset);padding-left: calc(var(--hi-v4-grid-row-gutter) / 2);padding-right: calc(var(--hi-v4-grid-row-gutter) / 2); }";
 
-var __styleInject__ = require('style-inject/dist/style-inject.es.js')["default"];
+var __styleInject__ = require('inject-head-style')["default"];
 
 __styleInject__(css_248z);
 

package/lib/esm/Grid.js

@@ -12,7 +12,7 @@ import React, { forwardRef, useMemo } from 'react';
 import { getPrefixCls, getPrefixStyleVar, cx } from '@hi-ui/classname';
 import { __DEV__ } from '@hi-ui/env';
 import { GridProvider, useGridContext } from './context.js';
-import { isNumeric } from './utils/type-assertion/lib/esm/index.js';
+import { isNumeric } from '@hi-ui/type-assertion';
 var rowPrefix = getPrefixCls('grid-row');
 var gutterNameVar = getPrefixStyleVar('grid-row-gutter');
 var gapNameVar = getPrefixStyleVar('grid-row-gap'); // Row 与 Row 默认间距
@@ -126,32 +126,4 @@ if (__DEV__) {
   Col.displayName = 'Col';
 }
 
-var brPrefix = getPrefixCls('grid-br');
-/**
- * TODO: What is Grid Br
- */
-
-var Br = /*#__PURE__*/forwardRef(function (_a, ref) {
-  var _a$prefixCls3 = _a.prefixCls,
-      prefixCls = _a$prefixCls3 === void 0 ? brPrefix : _a$prefixCls3,
-      className = _a.className,
-      styleProp = _a.style,
-      height = _a.height,
-      rest = __rest(_a, ["prefixCls", "className", "style", "height"]);
-
-  var cls = cx(prefixCls, className);
-  var style = height ? Object.assign(Object.assign({}, styleProp), {
-    height: height
-  }) : styleProp;
-  return /*#__PURE__*/React.createElement("div", Object.assign({
-    ref: ref,
-    className: cls,
-    style: style
-  }, rest));
-});
-
-if (__DEV__) {
-  Br.displayName = 'Br';
-}
-
-export { Br, Col, Row };
+export { Col, Row };

package/lib/esm/index.js

@@ -8,11 +8,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import './styles/index.scss.js';
-import { Row, Col, Br } from './Grid.js';
-export { Br, Col, Row } from './Grid.js';
+import { Row, Col } from './Grid.js';
+export { Col, Row } from './Grid.js';
 var Grid = {
   Row: Row,
-  Col: Col,
-  Br: Br
+  Col: Col
 };
 export { Grid as default };

package/lib/esm/styles/index.scss.js

@@ -7,7 +7,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import __styleInject__ from 'style-inject/dist/style-inject.es.js';
+import __styleInject__ from 'inject-head-style';
 var css_248z = ".hi-v4-grid-row {position: relative;-webkit-box-sizing: border-box;box-sizing: border-box;display: -webkit-box;display: -ms-flexbox;display: flex;-ms-flex-wrap: wrap;flex-wrap: wrap;row-gap: var(--hi-v4-grid-row-gap);margin-left: calc(-1 * var(--hi-v4-grid-row-gutter) / 2);margin-right: calc(-1 * var(--hi-v4-grid-row-gutter) / 2); }.hi-v4-grid-row + .hi-v4-grid-row {margin-top: var(--hi-v4-grid-row-gap); }.hi-v4-grid-col {-webkit-box-sizing: border-box;box-sizing: border-box;-webkit-box-flex: 0;-ms-flex-positive: 0;flex-grow: 0;-ms-flex-negative: 0;flex-shrink: 0;-ms-flex-preferred-size: var(--hi-v4-grid-col-span);flex-basis: var(--hi-v4-grid-col-span);max-width: var(--hi-v4-grid-col-span);margin-left: var(--hi-v4-grid-col-offset);padding-left: calc(var(--hi-v4-grid-row-gutter) / 2);padding-right: calc(var(--hi-v4-grid-row-gutter) / 2); }";
 
 __styleInject__(css_248z);

package/lib/types/Grid.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { HiBaseHTMLProps } from '@hi-ui/core';
+import { GridJustifyEnum } from './types';
 /**
  * TODO: What is Grid Row
  */
@@ -8,7 +9,7 @@ export interface RowProps extends HiBaseHTMLProps<'div'> {
     /**
      * 里面的元素排布方式
      */
-    justify?: 'flex-start' | 'flex-end' | 'center' | 'space-around' | 'space-between';
+    justify?: GridJustifyEnum;
     /**
      * Row 里面元素之间是否有外边距，建议使用偶数
      */
@@ -39,15 +40,5 @@ export interface ColProps extends HiBaseHTMLProps<'div'> {
     /**
      * 里面的元素排布方式
      */
-    justify?: 'flex-start' | 'flex-end' | 'center' | 'space-around' | 'space-between';
-}
-/**
- * TODO: What is Grid Br
- */
-export declare const Br: React.ForwardRefExoticComponent<BrProps & React.RefAttributes<HTMLDivElement | null>>;
-export interface BrProps extends HiBaseHTMLProps<'div'> {
-    /**
-     *  换行符高度
-     */
-    height?: number;
+    justify?: GridJustifyEnum;
 }

package/lib/types/index.d.ts

@@ -3,7 +3,6 @@ import './styles/index.scss';
 declare const Grid: {
     Row: import("react").ForwardRefExoticComponent<import("./Grid").RowProps & import("react").RefAttributes<HTMLDivElement | null>>;
     Col: import("react").ForwardRefExoticComponent<import("./Grid").ColProps & import("react").RefAttributes<HTMLDivElement | null>>;
-    Br: import("react").ForwardRefExoticComponent<import("./Grid").BrProps & import("react").RefAttributes<HTMLDivElement | null>>;
 };
 export default Grid;
 export * from './Grid';

package/lib/types/types.d.ts

@@ -0,0 +1 @@
+export declare type GridJustifyEnum = 'flex-start' | 'flex-end' | 'center' | 'space-around' | 'space-between';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/grid",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.17",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -44,18 +44,19 @@
   },
   "dependencies": {
     "@hi-ui/classname": "^4.0.0-beta.0",
-    "@hi-ui/core": "^4.0.0-beta.8",
+    "@hi-ui/core": "^4.0.0-beta.9",
     "@hi-ui/core-css": "^4.0.0-beta.5",
-    "@hi-ui/env": "^4.0.0-beta.0"
+    "@hi-ui/env": "^4.0.0-beta.1",
+    "@hi-ui/type-assertion": "^4.0.0-beta.5"
   },
   "peerDependencies": {
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
   "devDependencies": {
-    "@hi-ui/hi-build": "^4.0.0-beta.4",
+    "@hi-ui/hi-build": "^4.0.0-beta.5",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "7f47840510e6dfce429eeed1591c154e321cd14f"
+  "gitHead": "8bb668d29361fae483ac3fde460bfc7e010417a6"
 }

package/lib/cjs/utils/type-assertion/lib/esm/index.js

@@ -1,26 +0,0 @@
-/** @LICENSE
- * @hi-ui/grid
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/grid#readme
- *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
-require('@babel/runtime/helpers/esm/typeof');
-/**
- * Assert is numeric
- */
-
-
-var isNumeric = function isNumeric(arg) {
-  return !Number.isNaN(Number(arg));
-};
-
-exports.isNumeric = isNumeric;

package/lib/esm/utils/type-assertion/lib/esm/index.js

@@ -1,19 +0,0 @@
-/** @LICENSE
- * @hi-ui/grid
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/grid#readme
- *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import '@babel/runtime/helpers/esm/typeof';
-/**
- * Assert is numeric
- */
-
-var isNumeric = function isNumeric(arg) {
-  return !Number.isNaN(Number(arg));
-};
-
-export { isNumeric };