tntd 3.0.0-beta.1 → 3.0.0-beta.2

package/es/tag/tag.js

@@ -1,13 +1,10 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
 };
 /*
  * @Author: 周泽飞 zefei.zhou@tongdun.net
@@ -26,116 +23,149 @@ import Icon from '../icon';
 export * from 'antd/es/tag';
 export var TagColors;
 (function (TagColors) {
-    TagColors["grey"] = "grey";
-    TagColors["rose"] = "rose";
-    TagColors["lightblue"] = "lightblue";
-    TagColors["bluegrey"] = "bluegrey";
-    TagColors["purplegrey"] = "purplegrey";
-    TagColors["lightpurple"] = "lightpurple";
-    TagColors["lightgreen"] = "lightgreen";
-    TagColors["tnt-pink"] = "tnt-pink";
-    TagColors["tnt-orange"] = "tnt-orange";
-    TagColors["tnt-purple"] = "tnt-purple";
+  TagColors["grey"] = "grey";
+  TagColors["rose"] = "rose";
+  TagColors["lightblue"] = "lightblue";
+  TagColors["bluegrey"] = "bluegrey";
+  TagColors["purplegrey"] = "purplegrey";
+  TagColors["lightpurple"] = "lightpurple";
+  TagColors["lightgreen"] = "lightgreen";
+  TagColors["tnt-pink"] = "tnt-pink";
+  TagColors["tnt-orange"] = "tnt-orange";
+  TagColors["tnt-purple"] = "tnt-purple";
 })(TagColors || (TagColors = {}));
 // 内置的状态
 const statusMap = {
-    success: {
-        icon: 'check-circle',
-        color: 'green',
-    },
-    info: {
-        icon: 'info-circle',
-        color: 'blue',
-    },
-    error: {
-        icon: 'close-circle',
-        color: 'red',
-    },
-    warning: {
-        icon: 'info-circle',
-        color: 'orange',
-    },
+  success: {
+    icon: 'check-circle',
+    color: 'green'
+  },
+  info: {
+    icon: 'info-circle',
+    color: 'blue'
+  },
+  error: {
+    icon: 'close-circle',
+    color: 'red'
+  },
+  warning: {
+    icon: 'info-circle',
+    color: 'orange'
+  }
 };
 const getDisplayEllipsisOptions = (props, prefixCls) => {
-    var _a;
-    const { ellipsisOptions, addonContent, addonType, addonPosition, children } = props || {};
-    const options = Object.assign({}, ellipsisOptions);
-    let addonContentInfo = null;
-    if (addonContent) {
-        addonContentInfo = addonContent;
+  var _a;
+  const {
+    ellipsisOptions,
+    addonContent,
+    addonType,
+    addonPosition,
+    children
+  } = props || {};
+  const options = Object.assign({}, ellipsisOptions);
+  let addonContentInfo = null;
+  if (addonContent) {
+    addonContentInfo = addonContent;
+  } else if (addonType && statusMap[addonType]) {
+    addonContentInfo = React.createElement(Icon, {
+      type: (_a = statusMap[addonType]) === null || _a === void 0 ? void 0 : _a.icon
+    });
+  }
+  if (addonContentInfo) {
+    addonContentInfo = React.createElement("span", {
+      className: `${prefixCls}-addon`
+    }, addonContentInfo);
+    if (addonPosition === 'prefix') {
+      options.prefix = addonContentInfo;
     }
-    else if (addonType && statusMap[addonType]) {
-        addonContentInfo = React.createElement(Icon, { type: (_a = statusMap[addonType]) === null || _a === void 0 ? void 0 : _a.icon });
+    if (addonPosition === 'suffix') {
+      options.suffix = addonContentInfo;
     }
-    if (addonContentInfo) {
-        addonContentInfo = React.createElement("span", { className: `${prefixCls}-addon` }, addonContentInfo);
-        if (addonPosition === 'prefix') {
-            options.prefix = addonContentInfo;
-        }
-        if (addonPosition === 'suffix') {
-            options.suffix = addonContentInfo;
-        }
-        if (options.Popover === true) {
-            options.content = children;
-        }
-        else {
-            options.title = children;
-        }
-        options.contentInfo = addonContentInfo;
+    if (options.Popover === true) {
+      options.content = children;
+    } else {
+      options.title = children;
     }
-    return options;
+    options.contentInfo = addonContentInfo;
+  }
+  return options;
 };
 export const Tag = forwardRef((props, ref) => {
-    var _a;
-    const { className, border = true, size, addonType, addonContent, addonPosition = 'prefix', ellipsisOptions, children } = props, restProps = __rest(props, ["className", "border", "size", "addonType", "addonContent", "addonPosition", "ellipsisOptions", "children"]);
-    let { color } = props || {};
-    if (!color && addonType) {
-        color = (_a = statusMap[addonType]) === null || _a === void 0 ? void 0 : _a.color;
-    }
-    return (React.createElement(ConfigConsumer, null, ({ getPrefixCls }) => {
-        var _a, _b, _c, _d, _e;
-        const prefixCls = getPrefixCls('tag');
-        const displayEllipsisOptions = getDisplayEllipsisOptions({
-            ellipsisOptions,
-            addonContent,
-            addonType,
-            addonPosition,
-            children,
-        }, prefixCls);
-        // 只有一个icon时 padding距离存在差异
-        const onlyIcon = React.isValidElement(children) &&
-            React.Children.only(children) &&
-            (children === null || children === void 0 ? void 0 : children.type) instanceof Function &&
-            ((_c = (_b = (_a = children === null || children === void 0 ? void 0 : children.type) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase) === null || _c === void 0 ? void 0 : _c.call(_b)) === 'icon';
-        // 前缀是图片 只处理一层节点下是图片的，否则就用户自定义样式
-        const addonIsImg = React.isValidElement(addonContent) &&
-            (addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) &&
-            typeof (addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) === 'string' &&
-            ((_e = (_d = addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) === null || _d === void 0 ? void 0 : _d.toLowerCase) === null || _e === void 0 ? void 0 : _e.call(_d)) === 'img';
-        return (React.createElement(AntdTag, Object.assign({ className: classNames({
-                [`${prefixCls}-${color}`]: color && !!TagColors[color],
-            }, 'tnt-tag', `${prefixCls}-${size || 'middle'}`, {
-                [`${prefixCls}-no-border`]: !border,
-            }, {
-                [`${prefixCls}-only-child`]: !children || onlyIcon,
-            }, {
-                [`${prefixCls}-addon-img`]: !!addonIsImg,
-            }, className || '') }, restProps, { color: !TagColors[color] ? color : '', ref: ref }),
-            !addonContent && !addonType && !ellipsisOptions && children,
-            (!!addonContent || !!addonType || !!ellipsisOptions) && (React.createElement("span", { className: `${prefixCls}-addon-wrap` },
-                !!children && React.createElement(Ellipsis, Object.assign({}, displayEllipsisOptions), children),
-                !children && (displayEllipsisOptions === null || displayEllipsisOptions === void 0 ? void 0 : displayEllipsisOptions.contentInfo)))));
-    }));
+  var _a;
+  const {
+      className,
+      border = true,
+      size,
+      addonType,
+      addonContent,
+      addonPosition = 'prefix',
+      ellipsisOptions,
+      children
+    } = props,
+    restProps = __rest(props, ["className", "border", "size", "addonType", "addonContent", "addonPosition", "ellipsisOptions", "children"]);
+  let {
+    color
+  } = props || {};
+  if (!color && addonType) {
+    color = (_a = statusMap[addonType]) === null || _a === void 0 ? void 0 : _a.color;
+  }
+  return React.createElement(ConfigConsumer, null, ({
+    getPrefixCls
+  }) => {
+    var _a, _b, _c, _d, _e;
+    const prefixCls = getPrefixCls('tag');
+    const displayEllipsisOptions = getDisplayEllipsisOptions({
+      ellipsisOptions,
+      addonContent,
+      addonType,
+      addonPosition,
+      children
+    }, prefixCls);
+    // 只有一个icon时 padding距离存在差异
+    const onlyIcon = React.isValidElement(children) && React.Children.only(children) && (children === null || children === void 0 ? void 0 : children.type) instanceof Function && ((_c = (_b = (_a = children === null || children === void 0 ? void 0 : children.type) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase) === null || _c === void 0 ? void 0 : _c.call(_b)) === 'icon';
+    // 前缀是图片 只处理一层节点下是图片的，否则就用户自定义样式
+    const addonIsImg = React.isValidElement(addonContent) && (addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) && typeof (addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) === 'string' && ((_e = (_d = addonContent === null || addonContent === void 0 ? void 0 : addonContent.type) === null || _d === void 0 ? void 0 : _d.toLowerCase) === null || _e === void 0 ? void 0 : _e.call(_d)) === 'img';
+    return React.createElement(AntdTag, Object.assign({
+      className: classNames({
+        [`${prefixCls}-${color}`]: color && !!TagColors[color]
+      }, 'tnt-tag', `${prefixCls}-${size || 'middle'}`, {
+        [`${prefixCls}-no-border`]: !border
+      }, {
+        [`${prefixCls}-only-child`]: !children || onlyIcon
+      }, {
+        [`${prefixCls}-addon-img`]: !!addonIsImg
+      }, className || '')
+    }, restProps, {
+      color: !TagColors[color] ? color : '',
+      ref: ref
+    }), !addonContent && !addonType && !ellipsisOptions && children, (!!addonContent || !!addonType || !!ellipsisOptions) && React.createElement("span", {
+      className: `${prefixCls}-addon-wrap`
+    }, !!children && React.createElement(Ellipsis, Object.assign({}, displayEllipsisOptions), children), !children && (displayEllipsisOptions === null || displayEllipsisOptions === void 0 ? void 0 : displayEllipsisOptions.contentInfo)));
+  });
 });
 Tag.CheckableTag = forwardRef((props, ref) => {
-    // 默认没有border
-    const _a = props || {}, { onChange, disabled, border = false, className } = _a, rest = __rest(_a, ["onChange", "disabled", "border", "className"]);
-    return (React.createElement(ConfigConsumer, null, ({ getPrefixCls }) => {
-        const prefixCls = getPrefixCls('tag-checkable');
-        return (React.createElement(AntdTag.CheckableTag, Object.assign({}, (!disabled && { onChange }), { className: classNames('tnt-tag', {
-                [`${prefixCls}-disabled`]: disabled,
-                [`${prefixCls}-border`]: !!border,
-            }) }, rest, { ref: ref })));
+  // 默认没有border
+  const _a = props || {},
+    {
+      onChange,
+      disabled,
+      border = false,
+      className
+    } = _a,
+    rest = __rest(_a, ["onChange", "disabled", "border", "className"]);
+  return React.createElement(ConfigConsumer, null, ({
+    getPrefixCls
+  }) => {
+    const prefixCls = getPrefixCls('tag-checkable');
+    return React.createElement(AntdTag.CheckableTag, Object.assign({}, !disabled && {
+      onChange
+    }, {
+      className: classNames('tnt-tag', {
+        [`${prefixCls}-disabled`]: disabled,
+        [`${prefixCls}-border`]: !!border
+      })
+    }, rest, {
+      ref: ref
     }));
-});
-//# sourceMappingURL=tag.js.map
+  });
+});

package/es/tag/tag.less

@@ -124,7 +124,8 @@
             background: @@lightColor;
             border-color: @@lightBorderColor;
             >.@{iconfont-css-prefix}-close {
-                color: fade(@@darkColor,80%);
+                color: @@darkColor;//fade(@@darkColor,80%);
+                opacity: .8;
             }
             &.@{tag-prefix-cls}-no-border{
                 border-color:transparent;

package/es/time-picker/TimePicker.js

@@ -1,13 +1,10 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
 };
 import React from 'react';
 import Icon from '../icon';
@@ -15,14 +12,25 @@ import { ConfigConsumer } from 'antd/es/config-provider';
 import AntTimePicker from 'antd/es/time-picker';
 import classNames from 'classnames';
 export * from 'antd/es/time-picker';
-const TimePicker = (props) => {
-    //theme样式类型 outline | fill  默认 outline
-    const { theme = 'outline', className, suffixIcon } = props, restProps = __rest(props, ["theme", "className", "suffixIcon"]);
-    const defaultIcon = React.createElement(Icon, { type: "clock-circle" });
-    return (React.createElement(ConfigConsumer, null, ({ getPrefixCls }) => {
-        const prefixCls = getPrefixCls('time-picker');
-        return (React.createElement(AntTimePicker, Object.assign({ suffixIcon: suffixIcon || defaultIcon, className: classNames(className, `${prefixCls}-${theme}`) }, restProps)));
-    }));
+const TimePicker = props => {
+  //theme样式类型 outline | fill  默认 outline
+  const {
+      theme = 'outline',
+      className,
+      suffixIcon
+    } = props,
+    restProps = __rest(props, ["theme", "className", "suffixIcon"]);
+  const defaultIcon = React.createElement(Icon, {
+    type: "clock-circle"
+  });
+  return React.createElement(ConfigConsumer, null, ({
+    getPrefixCls
+  }) => {
+    const prefixCls = getPrefixCls('time-picker');
+    return React.createElement(AntTimePicker, Object.assign({
+      suffixIcon: suffixIcon || defaultIcon,
+      className: classNames(className, `${prefixCls}-${theme}`)
+    }, restProps));
+  });
 };
-export default TimePicker;
-//# sourceMappingURL=TimePicker.js.map
+export default TimePicker;

package/es/time-picker/index.js

@@ -3,5 +3,4 @@ import { PreviewText } from '../preview-text';
 import './style';
 import './index.less';
 import TimePicker from './TimePicker';
-export default connectReadonlyComponent(TimePicker, PreviewText.TimePicker);
-//# sourceMappingURL=index.js.map
+export default connectReadonlyComponent(TimePicker, PreviewText.TimePicker);

package/es/time-picker/style/index.js

@@ -1,3 +1,2 @@
 import '../../style/index.less';
-import './index.less';
-//# sourceMappingURL=index.js.map
+import './index.less';

package/es/time-picker/style/index.less

@@ -194,7 +194,8 @@
     z-index: 1;
     width: 14px;
     height: 14px;
-    margin-top: -7px;
+    // margin-top: -7px;
+    margin-top: -8px;
     color: @disabled-color;
     line-height: 14px;
     transition: all 0.3s @ease-in-out;

package/es/timeline/index.js

@@ -1,5 +1,4 @@
 import Timeline from 'antd/es/timeline';
 import './style';
 export * from 'antd/es/timeline';
-export default Timeline;
-//# sourceMappingURL=index.js.map
+export default Timeline;

package/es/timeline/style/index.js

@@ -1,3 +1,2 @@
 import '../../style/index.less';
-import './index.less';
-//# sourceMappingURL=index.js.map
+import './index.less';

package/es/timeline/style/index.less

@@ -80,7 +80,7 @@
 
     &-content {
       position: relative;
-      top: calc(-(@font-size-base * @line-height-base - @font-size-base) + 1px);
+      top: calc(@font-size-base - @font-size-base * @line-height-base + 1px);
       margin: 0 0 0 18px;
       word-break: break-word;
     }

package/es/title/index.js

@@ -1,25 +1,37 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
 };
 import React from 'react';
 import cn from 'classnames';
 import { doUpperTitle } from '../utils';
 import './index.less';
-export default (props) => {
-    const _a = props || {}, { title = '暂无标题', subTitle, size = 'default', extra, number, simple } = _a, rest = __rest(_a, ["title", "subTitle", "size", "extra", "number", "simple"]);
-    return (React.createElement("div", Object.assign({ className: cn('tntd-title', size, { 'has-number': number }, { 'is-simple': simple }) }, rest),
-        React.createElement("div", { className: "tntd-title-text" },
-            number && React.createElement("i", { className: "count" }, number <= 9 ? `0${number}` : number),
-            React.createElement("h3", null, doUpperTitle(title)),
-            React.createElement("span", null, subTitle)),
-        extra && React.createElement("div", { className: "tntd-title-extra" }, extra)));
-};
-//# sourceMappingURL=index.js.map
+export default (props => {
+  const _a = props || {},
+    {
+      title = '暂无标题',
+      subTitle,
+      size = 'default',
+      extra,
+      number,
+      simple
+    } = _a,
+    rest = __rest(_a, ["title", "subTitle", "size", "extra", "number", "simple"]);
+  return React.createElement("div", Object.assign({
+    className: cn('tntd-title', size, {
+      'has-number': number
+    }, {
+      'is-simple': simple
+    })
+  }, rest), React.createElement("div", {
+    className: "tntd-title-text"
+  }, number && React.createElement("i", {
+    className: "count"
+  }, number <= 9 ? `0${number}` : number), React.createElement("h3", null, doUpperTitle(title)), React.createElement("span", null, subTitle)), extra && React.createElement("div", {
+    className: "tntd-title-extra"
+  }, extra));
+});

package/es/tntd-action/Action.js

@@ -1,13 +1,10 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
 };
 import React, { useState, useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
@@ -17,29 +14,53 @@ import classNames from 'classnames';
 import { Button } from '../button';
 const defaultGetContainer = () => document.body;
 export default function WarpAction(_a) {
-    var { getContainer = defaultGetContainer } = _a, other = __rest(_a, ["getContainer"]);
-    return (React.createElement(ConfigConsumer, null, ({ getPrefixCls, getPopupContainer: getContextPopupContainer }) => {
-        const _getContainer = getContainer === undefined ? getContextPopupContainer : getContainer;
-        return (React.createElement(LocaleReceiver, { componentName: "TntdAction" }, (locale) => {
-            return React.createElement(Action, Object.assign({}, other, { locale: locale, getContainer: _getContainer }));
-        }));
-    }));
+  var {
+      getContainer = defaultGetContainer
+    } = _a,
+    other = __rest(_a, ["getContainer"]);
+  return React.createElement(ConfigConsumer, null, ({
+    getPrefixCls,
+    getPopupContainer: getContextPopupContainer
+  }) => {
+    const _getContainer = getContainer === undefined ? getContextPopupContainer : getContainer;
+    return React.createElement(LocaleReceiver, {
+      componentName: "TntdAction"
+    }, locale => {
+      return React.createElement(Action, Object.assign({}, other, {
+        locale: locale,
+        getContainer: _getContainer
+      }));
+    });
+  });
 }
-function Action({ title, data, locale, className, getContainer }) {
-    const [visible, setVisible] = useState(false);
-    const ref = useRef();
-    useEffect(() => {
-        ref.current = getContainer();
-    }, [getContainer]);
-    useEffect(() => {
-        setVisible(data.length > 0);
-    }, [data]);
-    if (ref.current && visible) {
-        return ReactDOM.createPortal(React.createElement("div", { className: classNames('tnt-action', className) },
-            React.createElement("div", { className: "fr" }, data),
-            React.createElement(Button, { shape: "circle", icon: "close", type: "tertiary", onClick: () => setVisible(false) }),
-            React.createElement("span", { className: "tnt-action-text" }, title)), ref.current);
-    }
-    return null;
-}
-//# sourceMappingURL=Action.js.map
+function Action({
+  title,
+  data,
+  locale,
+  className,
+  getContainer
+}) {
+  const [visible, setVisible] = useState(false);
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = getContainer();
+  }, [getContainer]);
+  useEffect(() => {
+    setVisible(data.length > 0);
+  }, [data]);
+  if (ref.current && visible) {
+    return ReactDOM.createPortal(React.createElement("div", {
+      className: classNames('tnt-action', className)
+    }, React.createElement("div", {
+      className: "fr"
+    }, data), React.createElement(Button, {
+      shape: "circle",
+      icon: "close",
+      type: "tertiary",
+      onClick: () => setVisible(false)
+    }), React.createElement("span", {
+      className: "tnt-action-text"
+    }, title)), ref.current);
+  }
+  return null;
+}