@arcblock/ux 2.1.51 → 2.1.54

package/lib/RelativeTime/index.js

@@ -27,7 +27,7 @@ var _Util = require("../Util");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["value", "locale", "withoutSuffix", "from", "to", "type"];
+const _excluded = ["value", "locale", "withoutSuffix", "from", "to", "type", "tz"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -79,7 +79,8 @@ function RelativeTime(_ref) {
     withoutSuffix,
     from,
     to,
-    type
+    type,
+    tz
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -87,19 +88,26 @@ function RelativeTime(_ref) {
     return '-';
   }
 
-  const localeOption = locale === 'zh' ? 'zh-cn' : 'zh-us';
+  const localeOption = locale === 'zh' ? 'zh-cn' : 'en-us';
+  const datetime = (0, _dayjs.default)(value).locale(localeOption);
+
+  if (tz) {
+    datetime.tz(tz);
+  }
+
   let relativeString;
 
   if (from) {
-    relativeString = (0, _dayjs.default)(value).locale(localeOption).from(from, withoutSuffix);
+    relativeString = datetime.from(from, withoutSuffix);
   } else if (to) {
-    relativeString = (0, _dayjs.default)(value).locale(localeOption).to(to, withoutSuffix);
+    relativeString = datetime.to(to, withoutSuffix);
   } else {
-    relativeString = (0, _dayjs.default)(value).locale(localeOption).fromNow(withoutSuffix);
+    relativeString = datetime.fromNow(withoutSuffix);
   }
 
   const absoluteString = (0, _Util.formatToDatetime)(value, {
-    locale: localeOption
+    locale: localeOption,
+    tz
   });
   let innerContent = relativeString;
   let popContent = absoluteString;
@@ -125,12 +133,14 @@ RelativeTime.propTypes = {
   withoutSuffix: _propTypes.default.bool,
   from: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   to: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-  type: _propTypes.default.string
+  type: _propTypes.default.oneOf(['relative', 'absolute']),
+  tz: _propTypes.default.string
 };
 RelativeTime.defaultProps = {
   locale: 'en',
   withoutSuffix: false,
   from: '',
   to: '',
-  type: 'relative'
+  type: 'relative',
+  tz: undefined
 };

package/lib/Util/index.js

@@ -236,7 +236,7 @@ const createDateFormater = format => (date, _ref2) => {
 
   let instance = dateTool(date);
 
-  if (typeof tz !== 'undefined') {
+  if (tz) {
     instance = instance.tz(tz);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.1.51",
+  "version": "2.1.54",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "fd1815a1cf5ad25d34017550fb4cd429afd7b375",
+  "gitHead": "a3907bf6904c52478a692d09ee0c4fc4fab7d42e",
   "dependencies": {
-    "@arcblock/icons": "^2.1.51",
-    "@arcblock/react-hooks": "^2.1.51",
+    "@arcblock/icons": "^2.1.54",
+    "@arcblock/react-hooks": "^2.1.54",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",

package/src/RelativeTime/index.js

@@ -34,24 +34,29 @@ dayjs.updateLocale('zh-cn', {
 });
 setDateTool(dayjs);
 
-export default function RelativeTime({ value, locale, withoutSuffix, from, to, type, ...rest }) {
+export default function RelativeTime({ value, locale, withoutSuffix, from, to, type, tz, ...rest }) {
   if (!value) {
     return '-';
   }
 
-  const localeOption = locale === 'zh' ? 'zh-cn' : 'zh-us';
+  const localeOption = locale === 'zh' ? 'zh-cn' : 'en-us';
+  const datetime = dayjs(value).locale(localeOption);
+
+  if (tz) {
+    datetime.tz(tz);
+  }
 
   let relativeString;
 
   if (from) {
-    relativeString = dayjs(value).locale(localeOption).from(from, withoutSuffix);
+    relativeString = datetime.from(from, withoutSuffix);
   } else if (to) {
-    relativeString = dayjs(value).locale(localeOption).to(to, withoutSuffix);
+    relativeString = datetime.to(to, withoutSuffix);
   } else {
-    relativeString = dayjs(value).locale(localeOption).fromNow(withoutSuffix);
+    relativeString = datetime.fromNow(withoutSuffix);
   }
 
-  const absoluteString = formatToDatetime(value, { locale: localeOption });
+  const absoluteString = formatToDatetime(value, { locale: localeOption, tz });
 
   let innerContent = relativeString;
   let popContent = absoluteString;
@@ -74,7 +79,8 @@ RelativeTime.propTypes = {
   withoutSuffix: PropTypes.bool,
   from: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   to: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  type: PropTypes.string,
+  type: PropTypes.oneOf(['relative', 'absolute']),
+  tz: PropTypes.string,
 };
 
 RelativeTime.defaultProps = {
@@ -83,4 +89,5 @@ RelativeTime.defaultProps = {
   from: '',
   to: '',
   type: 'relative',
+  tz: undefined,
 };

package/src/Util/index.js

@@ -190,7 +190,7 @@ const createDateFormater =
 
     let instance = dateTool(date);
 
-    if (typeof tz !== 'undefined') {
+    if (tz) {
       instance = instance.tz(tz);
     }