@twreporter/react-components 8.17.0-rc.1 → 8.17.0-rc.10

package/lib/text/constants/headline-type.js

@@ -3,34 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TYPE_STORYBOOK_ARG_TYPE = exports.TYPE_FONT_FAMILY = exports.TYPE_PROP_TYPES = exports.TYPE = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
+exports.TYPE_FONT_FAMILY = void 0;
 
 var _font = require("@twreporter/core/lib/constants/font");
 
-var _TYPE_FONT_FAMILY;
+var _enums = require("../enums");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _Object$freeze;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var TYPE = {
-  "default": 'default',
-  article: 'article'
-};
-exports.TYPE = TYPE;
-
-var TYPE_PROP_TYPES = _propTypes["default"].oneOf([TYPE["default"], TYPE.article]);
-
-exports.TYPE_PROP_TYPES = TYPE_PROP_TYPES;
-var TYPE_FONT_FAMILY = (_TYPE_FONT_FAMILY = {}, _defineProperty(_TYPE_FONT_FAMILY, TYPE["default"], _font.fontFamily["default"]), _defineProperty(_TYPE_FONT_FAMILY, TYPE.article, _font.fontFamily.title), _TYPE_FONT_FAMILY);
-exports.TYPE_FONT_FAMILY = TYPE_FONT_FAMILY;
-var TYPE_STORYBOOK_ARG_TYPE = {
-  defaultValue: TYPE["default"],
-  options: [TYPE["default"], TYPE.article],
-  control: {
-    type: 'radio'
-  }
-};
-exports.TYPE_STORYBOOK_ARG_TYPE = TYPE_STORYBOOK_ARG_TYPE;
+var TYPE_FONT_FAMILY = Object.freeze((_Object$freeze = {}, _defineProperty(_Object$freeze, _enums.Type.DEFAULT, _font.fontFamily["default"]), _defineProperty(_Object$freeze, _enums.Type.ARTICLE, _font.fontFamily.title), _Object$freeze));
+exports.TYPE_FONT_FAMILY = TYPE_FONT_FAMILY;

package/lib/text/enums/index.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Weight = exports.Type = void 0;
+var Type = Object.freeze({
+  DEFAULT: 'default',
+  ARTICLE: 'article'
+});
+exports.Type = Type;
+var Weight = Object.freeze({
+  EXTRA_LIGHT: 'extraLight',
+  NORMAL: 'normal',
+  BOLD: 'bold'
+});
+exports.Weight = Weight;

package/lib/text/headline.js

@@ -13,6 +13,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _headlineType = require("./constants/headline-type");
 
+var _enums = require("./enums");
+
 var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
 
 var _font = require("@twreporter/core/lib/constants/font");
@@ -78,7 +80,7 @@ var withContainer = function withContainer(HeadlineContainer) {
     var _ref$text = _ref.text,
         text = _ref$text === void 0 ? '' : _ref$text,
         _ref$type = _ref.type,
-        type = _ref$type === void 0 ? _headlineType.TYPE["default"] : _ref$type,
+        type = _ref$type === void 0 ? _enums.Type.DEFAULT : _ref$type,
         _ref$className = _ref.className,
         className = _ref$className === void 0 ? '' : _ref$className,
         props = _objectWithoutProperties(_ref, _excluded);
@@ -93,9 +95,10 @@ var withContainer = function withContainer(HeadlineContainer) {
   headline.displayName = 'headline';
   headline.propTypes = {
     text: _propTypes["default"].string,
-    type: _headlineType.TYPE_PROP_TYPES,
+    type: _propTypes["default"].oneOf(Object.values(_enums.Type)),
     className: _propTypes["default"].string
   };
+  headline.Type = _enums.Type;
   return headline;
 };
 

package/lib/text/paragraph.js

@@ -11,11 +11,11 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _fontWeight = require("./constants/font-weight");
+var _enums = require("./enums");
 
 var _font = require("@twreporter/core/lib/constants/font");
 
-var _excluded = ["text", "weight", "className"];
+var _excluded = ["text", "weight", "className", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -54,23 +54,26 @@ var withContainer = function withContainer(ParagraphContainer) {
     var _ref$text = _ref.text,
         text = _ref$text === void 0 ? '' : _ref$text,
         _ref$weight = _ref.weight,
-        weight = _ref$weight === void 0 ? _fontWeight.WEIGHT.normal : _ref$weight,
+        weight = _ref$weight === void 0 ? _enums.Weight.NORMAL : _ref$weight,
         _ref$className = _ref.className,
         className = _ref$className === void 0 ? '' : _ref$className,
+        children = _ref.children,
         props = _objectWithoutProperties(_ref, _excluded);
 
     return /*#__PURE__*/_react["default"].createElement(ParagraphContainer, _extends({
       weight: weight,
       className: className
-    }, props), text);
+    }, props), text, children);
   };
 
   paragraph.displayName = 'paragraph';
   paragraph.propTypes = {
     text: _propTypes["default"].string,
-    weight: _fontWeight.WEIGHT_PROP_TYPES,
-    className: _propTypes["default"].string
+    weight: _propTypes["default"].oneOf(Object.values(_enums.Weight)),
+    className: _propTypes["default"].string,
+    children: _propTypes["default"].element
   };
+  paragraph.Weight = _enums.Weight;
   return paragraph;
 };
 

package/lib/text/stories/headline.stories.js

@@ -7,9 +7,11 @@ exports.h6 = exports.h5 = exports.h4 = exports.h3 = exports.h2 = exports.h1 = ex
 
 var _react = _interopRequireDefault(require("react"));
 
+var _getEnumArg = require("../../storybook/utils/get-enum-arg");
+
 var _headline = require("../headline");
 
-var _headlineType = require("../constants/headline-type");
+var _enums = require("../enums");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -17,12 +19,12 @@ var _default = {
   title: 'Text/Headline',
   component: _headline.H1,
   argTypes: {
-    type: _headlineType.TYPE_STORYBOOK_ARG_TYPE
+    type: (0, _getEnumArg.getRadioArg)(_enums.Type, _enums.Type.DEFAULT)
   }
 };
 exports["default"] = _default;
 var defaultText = '標題「標題」：標題，《標題》標題English標題123標題？';
-var defaultType = _headlineType.TYPE["default"];
+var defaultType = _headline.H1.Type.DEFAULT;
 
 var h1 = function h1(args) {
   return /*#__PURE__*/_react["default"].createElement(_headline.H1, args);

package/lib/text/stories/paragraph.stories.js

@@ -7,9 +7,11 @@ exports.p4 = exports.p3 = exports.p2 = exports.p1 = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _getEnumArg = require("../../storybook/utils/get-enum-arg");
+
 var _paragraph = require("../paragraph");
 
-var _fontWeight = require("../constants/font-weight");
+var _enums = require("../enums");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -17,12 +19,12 @@ var _default = {
   title: 'Text/Paragraph',
   component: _paragraph.P1,
   argTypes: {
-    weight: _fontWeight.WEIGHT_STORYBOOK_ARG_TYPE
+    weight: (0, _getEnumArg.getRadioArg)(_enums.Weight, _enums.Weight.NORMAL)
   }
 };
 exports["default"] = _default;
 var defaultText = '內文「內文」：內文，《內文》內文English內文123內文？';
-var defaultWeight = _fontWeight.WEIGHT.normal;
+var defaultWeight = _paragraph.P1.Weight.NORMAL;
 
 var p1 = function p1(args) {
   return /*#__PURE__*/_react["default"].createElement(_paragraph.P1, args);

package/lib/title-bar/components/bar.js

@@ -37,9 +37,9 @@ var TitleBar = function TitleBar(_ref) {
     text: title
   }), /*#__PURE__*/_react["default"].createElement(_paragraph.P1, {
     text: subtitle,
-    weight: "bold"
+    weight: _paragraph.P1.Weight.BOLD
   }), /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-    direction: "horizontal"
+    direction: _divider["default"].Direction.HORIZONTAL
   }));
 };
 

package/lib/title-bar/components/tab.js

@@ -94,7 +94,7 @@ var TabItem = function TabItem(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(StyledTextButton, {
     text: text,
     active: isActive,
-    size: "L"
+    size: _button.TextButton.Size.L
   })));
 };
 
@@ -187,7 +187,7 @@ var TitleTab = function TitleTab(_ref3) {
     tabs: tabs,
     activeTabIndex: activeTabIndex
   }), /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-    direction: "horizontal"
+    direction: _divider["default"].Direction.HORIZONTAL
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-components",
-  "version": "8.17.0-rc.1",
+  "version": "8.17.0-rc.10",
   "main": "lib/index.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -15,11 +15,12 @@
     "chromatic": "npx chromatic --exit-zero-on-changes"
   },
   "dependencies": {
-    "@twreporter/core": "^1.8.3-rc.1",
-    "@twreporter/redux": "^7.5.1-rc.1",
+    "@twreporter/core": "^1.9.0-rc.1",
+    "@twreporter/redux": "^7.5.1-rc.4",
     "fontfaceobserver-es": "^3.3.3",
     "hoist-non-react-statics": "^2.3.1",
     "lodash": "^4.0.0",
+    "material-symbols": "^0.5.5",
     "memoize-one": "^5.0.5",
     "prop-types": "^15.0.0",
     "react": "^16.3.0",
@@ -44,5 +45,5 @@
     "babel-loader": "^8.2.4",
     "chromatic": "^6.5.4"
   },
-  "gitHead": "8b5caea308bf4471059644072ca9edb78c4b6fde"
+  "gitHead": "5683a389b16e6ed857cd3faad348951f556f3746"
 }

package/lib/button/constants/size.js

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SIZE_STORYBOOK_ARG_TYPE = exports.SIZE_PROP_TYPES = exports.SIZE = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var SIZE = {
-  S: 'S',
-  L: 'L'
-};
-exports.SIZE = SIZE;
-
-var SIZE_PROP_TYPES = _propTypes["default"].oneOf([SIZE.S, SIZE.L]);
-
-exports.SIZE_PROP_TYPES = SIZE_PROP_TYPES;
-var SIZE_STORYBOOK_ARG_TYPE = {
-  defaultValue: SIZE.S,
-  options: [SIZE.S, SIZE.L],
-  control: {
-    type: 'radio'
-  }
-};
-exports.SIZE_STORYBOOK_ARG_TYPE = SIZE_STORYBOOK_ARG_TYPE;

package/lib/button/constants/type.js

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TYPE_STORYBOOK_ARG_TYPE = exports.TYPE_PROP_TYPES = exports.TYPE = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var TYPE = {
-  primary: 'primary',
-  secondary: 'secondary'
-};
-exports.TYPE = TYPE;
-
-var TYPE_PROP_TYPES = _propTypes["default"].oneOf([TYPE.primary, TYPE.secondary]);
-
-exports.TYPE_PROP_TYPES = TYPE_PROP_TYPES;
-var TYPE_STORYBOOK_ARG_TYPE = {
-  defaultValue: TYPE.primary,
-  options: [TYPE.primary, TYPE.secondary],
-  control: {
-    type: 'radio'
-  }
-};
-exports.TYPE_STORYBOOK_ARG_TYPE = TYPE_STORYBOOK_ARG_TYPE;

package/lib/input/constants/type.js

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WIDTH_PROP_TYPE = exports.WIDTH_TYPE = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var WIDTH_TYPE = {
-  fit: 'fit',
-  stretch: 'stretch'
-};
-exports.WIDTH_TYPE = WIDTH_TYPE;
-
-var WIDTH_PROP_TYPE = _propTypes["default"].oneOf([WIDTH_TYPE.fit, WIDTH_TYPE.stretch]);
-
-exports.WIDTH_PROP_TYPE = WIDTH_PROP_TYPE;

package/lib/text/constants/font-weight.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WEIGHT_STORYBOOK_ARG_TYPE = exports.WEIGHT_PROP_TYPES = exports.WEIGHT = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var WEIGHT = {
-  extraLight: 'extraLight',
-  normal: 'normal',
-  bold: 'bold'
-};
-exports.WEIGHT = WEIGHT;
-
-var WEIGHT_PROP_TYPES = _propTypes["default"].oneOf([WEIGHT.extraLight, WEIGHT.normal, WEIGHT.bold]);
-
-exports.WEIGHT_PROP_TYPES = WEIGHT_PROP_TYPES;
-var WEIGHT_STORYBOOK_ARG_TYPE = {
-  defaultValue: WEIGHT.normal,
-  options: [WEIGHT.extraLight, WEIGHT.normal, WEIGHT.bold],
-  control: {
-    type: 'radio'
-  }
-};
-exports.WEIGHT_STORYBOOK_ARG_TYPE = WEIGHT_STORYBOOK_ARG_TYPE;

package/lib/text/link.js

@@ -1,87 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _theme = require("@twreporter/core/lib/constants/theme");
-
-var _color = require("@twreporter/core/lib/constants/color");
-
-var _excluded = ["path", "name", "theme", "isBold"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-var getColorFromTheme = function getColorFromTheme(theme) {
-  switch (theme) {
-    case _theme.ARTICLE_THEME.v2.photo:
-      return _color.COLOR_ARTICLE.milkTea;
-
-    case _theme.ARTICLE_THEME.v2.pink:
-      return _color.COLOR_ARTICLE.blue;
-
-    case _theme.ARTICLE_THEME.v2["default"]:
-    default:
-      return _color.COLOR_ARTICLE.brown;
-  }
-};
-
-var Text = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "link__Text",
-  componentId: "pki7nr-0"
-})(["color:", ";display:inline-block;font-size:16px;line-height:1;padding:", ";&:hover{padding-bottom:2px;border-width:0 0 1px 0;border-style:solid;border-color:", ";}"], function (props) {
-  return props.color;
-}, function (props) {
-  return props.padding;
-}, function (props) {
-  return props.color;
-});
-
-var Anchor = /*#__PURE__*/_styledComponents["default"].a.withConfig({
-  displayName: "link__Anchor",
-  componentId: "pki7nr-1"
-})(["text-decoration:none;"]);
-
-var TextLink = function TextLink(_ref) {
-  var _ref$path = _ref.path,
-      path = _ref$path === void 0 ? '' : _ref$path,
-      _ref$name = _ref.name,
-      name = _ref$name === void 0 ? '' : _ref$name,
-      _ref$theme = _ref.theme,
-      theme = _ref$theme === void 0 ? _theme.ARTICLE_THEME.v2["default"] : _ref$theme,
-      _ref$isBold = _ref.isBold,
-      isBold = _ref$isBold === void 0 ? false : _ref$isBold,
-      props = _objectWithoutProperties(_ref, _excluded);
-
-  var color = getColorFromTheme(theme);
-  return /*#__PURE__*/_react["default"].createElement(Anchor, {
-    href: path
-  }, /*#__PURE__*/_react["default"].createElement(Text, _extends({
-    color: color,
-    style: {
-      fontWeight: isBold ? 'bold' : 'normal'
-    }
-  }, props), name));
-};
-
-TextLink.propTypes = {
-  path: _propTypes["default"].string.isRequired,
-  name: _propTypes["default"].string,
-  theme: _propTypes["default"].string,
-  isBold: _propTypes["default"].bool
-};
-var _default = TextLink;
-exports["default"] = _default;

package/lib/text/stories/link.stories.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.textLink = exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _link = _interopRequireDefault(require("../link"));
-
-var _theme = require("@twreporter/core/lib/constants/theme");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var _default = {
-  title: 'Text/Link',
-  component: _link["default"],
-  argTypes: {
-    theme: {
-      defaultValue: _theme.ARTICLE_THEME.v2["default"],
-      options: [_theme.ARTICLE_THEME.v2["default"], _theme.ARTICLE_THEME.v2.pink, _theme.ARTICLE_THEME.v2.photo],
-      control: {
-        type: 'radio'
-      }
-    }
-  }
-};
-exports["default"] = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/_react["default"].createElement(_link["default"], args);
-};
-
-var textLink = Template.bind({});
-exports.textLink = textLink;
-textLink.args = {
-  name: '分類',
-  path: '/categories/human_rights_and_society',
-  theme: _theme.ARTICLE_THEME.v2["default"],
-  isBold: true
-};