amis-ui 2.8.0 → 2.9.0

package/esm/node_modules/rc-overflow/es/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,42 +11,38 @@ import cx from 'classnames';
 import RefResizeObserver from '../../rc-resize-observer/es/index.js';
 
 var _excluded = ["prefixCls", "invalidate", "item", "renderItem", "responsive", "responsiveDisabled", "registerSize", "itemKey", "className", "style", "children", "display", "order", "component"];
-
+// Use shared variable to save bundle size
 var UNDEFINED = undefined;
-
 function InternalItem(props, ref) {
   var prefixCls = props.prefixCls,
-      invalidate = props.invalidate,
-      item = props.item,
-      renderItem = props.renderItem,
-      responsive = props.responsive,
-      responsiveDisabled = props.responsiveDisabled,
-      registerSize = props.registerSize,
-      itemKey = props.itemKey,
-      className = props.className,
-      style = props.style,
-      children = props.children,
-      display = props.display,
-      order = props.order,
-      _props$component = props.component,
-      Component = _props$component === void 0 ? 'div' : _props$component,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var mergedHidden = responsive && !display; // ================================ Effect ================================
-
+    invalidate = props.invalidate,
+    item = props.item,
+    renderItem = props.renderItem,
+    responsive = props.responsive,
+    responsiveDisabled = props.responsiveDisabled,
+    registerSize = props.registerSize,
+    itemKey = props.itemKey,
+    className = props.className,
+    style = props.style,
+    children = props.children,
+    display = props.display,
+    order = props.order,
+    _props$component = props.component,
+    Component = _props$component === void 0 ? 'div' : _props$component,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var mergedHidden = responsive && !display;
+  // ================================ Effect ================================
   function internalRegisterSize(width) {
     registerSize(itemKey, width);
   }
-
   React.useEffect(function () {
     return function () {
       internalRegisterSize(null);
     };
-  }, []); // ================================ Render ================================
-
+  }, []);
+  // ================================ Render ================================
   var childNode = renderItem && item !== UNDEFINED ? renderItem(item) : children;
   var overflowStyle;
-
   if (!invalidate) {
     overflowStyle = {
       opacity: mergedHidden ? 0 : 1,
@@ -57,20 +53,16 @@ function InternalItem(props, ref) {
       position: mergedHidden ? 'absolute' : UNDEFINED
     };
   }
-
   var overflowProps = {};
-
   if (mergedHidden) {
     overflowProps['aria-hidden'] = true;
   }
-
   var itemNode = /*#__PURE__*/React.createElement(Component, _extends({
     className: cx(!invalidate && prefixCls, className),
     style: _objectSpread2(_objectSpread2({}, overflowStyle), style)
   }, overflowProps, restProps, {
     ref: ref
   }), childNode);
-
   if (responsive) {
     itemNode = /*#__PURE__*/React.createElement(RefResizeObserver, {
       onResize: function onResize(_ref) {
@@ -80,10 +72,8 @@ function InternalItem(props, ref) {
       disabled: responsiveDisabled
     }, itemNode);
   }
-
   return itemNode;
 }
-
 var Item = /*#__PURE__*/React.forwardRef(InternalItem);
 Item.displayName = 'Item';
 

package/esm/node_modules/rc-overflow/es/Overflow.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,109 +13,92 @@ import cx from 'classnames';
 import RefResizeObserver from '../../rc-resize-observer/es/index.js';
 import useLayoutEffect from '../../rc-util/es/hooks/useLayoutEffect.js';
 import Item from './Item.js';
-import { useBatchFrameState } from './hooks/useBatchFrameState.js';
+import useEffectState, { useBatcher } from './hooks/useEffectState.js';
 import RawItem from './RawItem.js';
 
 var _excluded = ["prefixCls", "data", "renderItem", "renderRawItem", "itemKey", "itemWidth", "ssr", "style", "className", "maxCount", "renderRest", "renderRawRest", "suffix", "component", "itemComponent", "onVisibleChange"];
 var OverflowContext = /*#__PURE__*/React.createContext(null);
 var RESPONSIVE = 'responsive';
 var INVALIDATE = 'invalidate';
-
 function defaultRenderRest(omittedItems) {
   return "+ ".concat(omittedItems.length, " ...");
 }
-
 function Overflow(props, ref) {
   var _props$prefixCls = props.prefixCls,
-      prefixCls = _props$prefixCls === void 0 ? 'rc-overflow' : _props$prefixCls,
-      _props$data = props.data,
-      data = _props$data === void 0 ? [] : _props$data,
-      renderItem = props.renderItem,
-      renderRawItem = props.renderRawItem,
-      itemKey = props.itemKey,
-      _props$itemWidth = props.itemWidth,
-      itemWidth = _props$itemWidth === void 0 ? 10 : _props$itemWidth,
-      ssr = props.ssr,
-      style = props.style,
-      className = props.className,
-      maxCount = props.maxCount,
-      renderRest = props.renderRest,
-      renderRawRest = props.renderRawRest,
-      suffix = props.suffix,
-      _props$component = props.component,
-      Component = _props$component === void 0 ? 'div' : _props$component,
-      itemComponent = props.itemComponent,
-      onVisibleChange = props.onVisibleChange,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var createUseState = useBatchFrameState();
+    prefixCls = _props$prefixCls === void 0 ? 'rc-overflow' : _props$prefixCls,
+    _props$data = props.data,
+    data = _props$data === void 0 ? [] : _props$data,
+    renderItem = props.renderItem,
+    renderRawItem = props.renderRawItem,
+    itemKey = props.itemKey,
+    _props$itemWidth = props.itemWidth,
+    itemWidth = _props$itemWidth === void 0 ? 10 : _props$itemWidth,
+    ssr = props.ssr,
+    style = props.style,
+    className = props.className,
+    maxCount = props.maxCount,
+    renderRest = props.renderRest,
+    renderRawRest = props.renderRawRest,
+    suffix = props.suffix,
+    _props$component = props.component,
+    Component = _props$component === void 0 ? 'div' : _props$component,
+    itemComponent = props.itemComponent,
+    onVisibleChange = props.onVisibleChange,
+    restProps = _objectWithoutProperties(props, _excluded);
   var fullySSR = ssr === 'full';
-
-  var _createUseState = createUseState(null),
-      _createUseState2 = _slicedToArray(_createUseState, 2),
-      containerWidth = _createUseState2[0],
-      setContainerWidth = _createUseState2[1];
-
+  var notifyEffectUpdate = useBatcher();
+  var _useEffectState = useEffectState(notifyEffectUpdate, null),
+    _useEffectState2 = _slicedToArray(_useEffectState, 2),
+    containerWidth = _useEffectState2[0],
+    setContainerWidth = _useEffectState2[1];
   var mergedContainerWidth = containerWidth || 0;
-
-  var _createUseState3 = createUseState(new Map()),
-      _createUseState4 = _slicedToArray(_createUseState3, 2),
-      itemWidths = _createUseState4[0],
-      setItemWidths = _createUseState4[1];
-
-  var _createUseState5 = createUseState(0),
-      _createUseState6 = _slicedToArray(_createUseState5, 2),
-      prevRestWidth = _createUseState6[0],
-      setPrevRestWidth = _createUseState6[1];
-
-  var _createUseState7 = createUseState(0),
-      _createUseState8 = _slicedToArray(_createUseState7, 2),
-      restWidth = _createUseState8[0],
-      setRestWidth = _createUseState8[1];
-
-  var _createUseState9 = createUseState(0),
-      _createUseState10 = _slicedToArray(_createUseState9, 2),
-      suffixWidth = _createUseState10[0],
-      setSuffixWidth = _createUseState10[1];
-
+  var _useEffectState3 = useEffectState(notifyEffectUpdate, new Map()),
+    _useEffectState4 = _slicedToArray(_useEffectState3, 2),
+    itemWidths = _useEffectState4[0],
+    setItemWidths = _useEffectState4[1];
+  var _useEffectState5 = useEffectState(notifyEffectUpdate, 0),
+    _useEffectState6 = _slicedToArray(_useEffectState5, 2),
+    prevRestWidth = _useEffectState6[0],
+    setPrevRestWidth = _useEffectState6[1];
+  var _useEffectState7 = useEffectState(notifyEffectUpdate, 0),
+    _useEffectState8 = _slicedToArray(_useEffectState7, 2),
+    restWidth = _useEffectState8[0],
+    setRestWidth = _useEffectState8[1];
+  var _useEffectState9 = useEffectState(notifyEffectUpdate, 0),
+    _useEffectState10 = _slicedToArray(_useEffectState9, 2),
+    suffixWidth = _useEffectState10[0],
+    setSuffixWidth = _useEffectState10[1];
   var _useState = useState(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      suffixFixedStart = _useState2[0],
-      setSuffixFixedStart = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    suffixFixedStart = _useState2[0],
+    setSuffixFixedStart = _useState2[1];
   var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      displayCount = _useState4[0],
-      setDisplayCount = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    displayCount = _useState4[0],
+    setDisplayCount = _useState4[1];
   var mergedDisplayCount = React.useMemo(function () {
     if (displayCount === null && fullySSR) {
       return Number.MAX_SAFE_INTEGER;
     }
-
     return displayCount || 0;
   }, [displayCount, containerWidth]);
-
   var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      restReady = _useState6[0],
-      setRestReady = _useState6[1];
-
-  var itemPrefixCls = "".concat(prefixCls, "-item"); // Always use the max width to avoid blink
-
-  var mergedRestWidth = Math.max(prevRestWidth, restWidth); // ================================= Data =================================
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    restReady = _useState6[0],
+    setRestReady = _useState6[1];
+  var itemPrefixCls = "".concat(prefixCls, "-item");
+  // Always use the max width to avoid blink
+  var mergedRestWidth = Math.max(prevRestWidth, restWidth);
+  // ================================= Data =================================
   var isResponsive = maxCount === RESPONSIVE;
   var shouldResponsive = data.length && isResponsive;
   var invalidate = maxCount === INVALIDATE;
   /**
    * When is `responsive`, we will always render rest node to get the real width of it for calculation
    */
-
   var showRest = shouldResponsive || typeof maxCount === 'number' && data.length > maxCount;
   var mergedData = useMemo(function () {
     var items = data;
-
     if (shouldResponsive) {
       if (containerWidth === null && fullySSR) {
         items = data;
@@ -125,30 +108,25 @@ function Overflow(props, ref) {
     } else if (typeof maxCount === 'number') {
       items = data.slice(0, maxCount);
     }
-
     return items;
   }, [data, itemWidth, containerWidth, maxCount, shouldResponsive]);
   var omittedItems = useMemo(function () {
     if (shouldResponsive) {
       return data.slice(mergedDisplayCount + 1);
     }
-
     return data.slice(mergedData.length);
-  }, [data, mergedData, shouldResponsive, mergedDisplayCount]); // ================================= Item =================================
-
+  }, [data, mergedData, shouldResponsive, mergedDisplayCount]);
+  // ================================= Item =================================
   var getKey = useCallback(function (item, index) {
     var _ref;
-
     if (typeof itemKey === 'function') {
       return itemKey(item);
     }
-
     return (_ref = itemKey && (item === null || item === void 0 ? void 0 : item[itemKey])) !== null && _ref !== void 0 ? _ref : index;
   }, [itemKey]);
   var mergedRenderItem = useCallback(renderItem || function (item) {
     return item;
   }, [renderItem]);
-
   function updateDisplayCount(count, suffixFixedStartVal, notReady) {
     // React 18 will sync render even when the value is same in some case.
     // We take `mergedData` as deps which may cause dead loop if it's dynamic generate.
@@ -156,81 +134,68 @@ function Overflow(props, ref) {
     if (displayCount === count && (suffixFixedStartVal === undefined || suffixFixedStartVal === suffixFixedStart)) {
       return;
     }
-
     setDisplayCount(count);
-
     if (!notReady) {
       setRestReady(count < data.length - 1);
       onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(count);
     }
-
     if (suffixFixedStartVal !== undefined) {
       setSuffixFixedStart(suffixFixedStartVal);
     }
-  } // ================================= Size =================================
-
-
+  }
+  // ================================= Size =================================
   function onOverflowResize(_, element) {
     setContainerWidth(element.clientWidth);
   }
-
   function registerSize(key, width) {
     setItemWidths(function (origin) {
       var clone = new Map(origin);
-
       if (width === null) {
         clone.delete(key);
       } else {
         clone.set(key, width);
       }
-
       return clone;
     });
   }
-
   function registerOverflowSize(_, width) {
     setRestWidth(width);
     setPrevRestWidth(restWidth);
   }
-
   function registerSuffixSize(_, width) {
     setSuffixWidth(width);
-  } // ================================ Effect ================================
-
-
+  }
+  // ================================ Effect ================================
   function getItemWidth(index) {
     return itemWidths.get(getKey(mergedData[index], index));
   }
-
   useLayoutEffect(function () {
-    if (mergedContainerWidth && mergedRestWidth && mergedData) {
+    if (mergedContainerWidth && typeof mergedRestWidth === 'number' && mergedData) {
       var totalWidth = suffixWidth;
       var len = mergedData.length;
-      var lastIndex = len - 1; // When data count change to 0, reset this since not loop will reach
-
+      var lastIndex = len - 1;
+      // When data count change to 0, reset this since not loop will reach
       if (!len) {
         updateDisplayCount(0, null);
         return;
       }
-
       for (var i = 0; i < len; i += 1) {
-        var currentItemWidth = getItemWidth(i); // Fully will always render
-
+        var currentItemWidth = getItemWidth(i);
+        // Fully will always render
         if (fullySSR) {
           currentItemWidth = currentItemWidth || 0;
-        } // Break since data not ready
-
-
+        }
+        // Break since data not ready
         if (currentItemWidth === undefined) {
           updateDisplayCount(i - 1, undefined, true);
           break;
-        } // Find best match
-
-
+        }
+        // Find best match
         totalWidth += currentItemWidth;
-
-        if ( // Only one means `totalWidth` is the final width
-        lastIndex === 0 && totalWidth <= mergedContainerWidth || // Last two width will be the final width
+        if (
+        // Only one means `totalWidth` is the final width
+        lastIndex === 0 && totalWidth <= mergedContainerWidth ||
+        // Last two width will be the final width
         i === lastIndex - 1 && totalWidth + getItemWidth(lastIndex) <= mergedContainerWidth) {
           // Additional check if match the end
           updateDisplayCount(lastIndex, null);
@@ -241,16 +206,14 @@ function Overflow(props, ref) {
           break;
         }
       }
-
       if (suffix && getItemWidth(0) + suffixWidth > mergedContainerWidth) {
         setSuffixFixedStart(null);
       }
     }
-  }, [mergedContainerWidth, itemWidths, restWidth, suffixWidth, getKey, mergedData]); // ================================ Render ================================
-
+  }, [mergedContainerWidth, itemWidths, restWidth, suffixWidth, getKey, mergedData]);
+  // ================================ Render ================================
   var displayRest = restReady && !!omittedItems.length;
   var suffixStyle = {};
-
   if (suffixFixedStart !== null && shouldResponsive) {
     suffixStyle = {
       position: 'absolute',
@@ -258,14 +221,13 @@ function Overflow(props, ref) {
       top: 0
     };
   }
-
   var itemSharedProps = {
     prefixCls: itemPrefixCls,
     responsive: shouldResponsive,
     component: itemComponent,
     invalidate: invalidate
-  }; // >>>>> Choice render fun by `renderRawItem`
-
+  };
+  // >>>>> Choice render fun by `renderRawItem`
   var internalRenderItemNode = renderRawItem ? function (item, index) {
     var key = getKey(item, index);
     return /*#__PURE__*/React.createElement(OverflowContext.Provider, {
@@ -289,8 +251,8 @@ function Overflow(props, ref) {
       registerSize: registerSize,
       display: index <= mergedDisplayCount
     }));
-  }; // >>>>> Rest node
-
+  };
+  // >>>>> Rest node
   var restNode;
   var restContextProps = {
     order: displayRest ? mergedDisplayCount : Number.MAX_SAFE_INTEGER,
@@ -298,7 +260,6 @@ function Overflow(props, ref) {
     registerSize: registerOverflowSize,
     display: displayRest
   };
-
   if (!renderRawRest) {
     var mergedRenderRest = renderRest || defaultRenderRest;
     restNode = /*#__PURE__*/React.createElement(Item, _extends({}, itemSharedProps, restContextProps), typeof mergedRenderRest === 'function' ? mergedRenderRest(omittedItems) : mergedRenderRest);
@@ -307,7 +268,6 @@ function Overflow(props, ref) {
       value: _objectSpread2(_objectSpread2({}, itemSharedProps), restContextProps)
     }, renderRawRest(omittedItems));
   }
-
   var overflowNode = /*#__PURE__*/React.createElement(Component, _extends({
     className: cx(!invalidate && prefixCls, className),
     style: style,
@@ -321,21 +281,18 @@ function Overflow(props, ref) {
     display: true,
     style: suffixStyle
   }), suffix));
-
   if (isResponsive) {
     overflowNode = /*#__PURE__*/React.createElement(RefResizeObserver, {
       onResize: onOverflowResize,
       disabled: !shouldResponsive
     }, overflowNode);
   }
-
   return overflowNode;
 }
-
 var ForwardOverflow = /*#__PURE__*/React.forwardRef(Overflow);
 ForwardOverflow.displayName = 'Overflow';
 ForwardOverflow.Item = RawItem;
 ForwardOverflow.RESPONSIVE = RESPONSIVE;
-ForwardOverflow.INVALIDATE = INVALIDATE; // Convert to generic type
+ForwardOverflow.INVALIDATE = INVALIDATE;
 
 export { OverflowContext, ForwardOverflow as default };

package/esm/node_modules/rc-overflow/es/RawItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,29 +11,24 @@ import Item from './Item.js';
 import { OverflowContext } from './Overflow.js';
 
 var _excluded = ["component"],
-    _excluded2 = ["className"],
-    _excluded3 = ["className"];
-
+  _excluded2 = ["className"],
+  _excluded3 = ["className"];
 var InternalRawItem = function InternalRawItem(props, ref) {
-  var context = React.useContext(OverflowContext); // Render directly when context not provided
-
+  var context = React.useContext(OverflowContext);
+  // Render directly when context not provided
   if (!context) {
     var _props$component = props.component,
-        Component = _props$component === void 0 ? 'div' : _props$component,
-        _restProps = _objectWithoutProperties(props, _excluded);
-
+      Component = _props$component === void 0 ? 'div' : _props$component,
+      _restProps = _objectWithoutProperties(props, _excluded);
     return /*#__PURE__*/React.createElement(Component, _extends({}, _restProps, {
       ref: ref
     }));
   }
-
   var contextClassName = context.className,
-      restContext = _objectWithoutProperties(context, _excluded2);
-
+    restContext = _objectWithoutProperties(context, _excluded2);
   var className = props.className,
-      restProps = _objectWithoutProperties(props, _excluded3); // Do not pass context to sub item to avoid multiple measure
-
-
+    restProps = _objectWithoutProperties(props, _excluded3);
+  // Do not pass context to sub item to avoid multiple measure
   return /*#__PURE__*/React.createElement(OverflowContext.Provider, {
     value: null
   }, /*#__PURE__*/React.createElement(Item, _extends({
@@ -41,7 +36,6 @@ var InternalRawItem = function InternalRawItem(props, ref) {
     className: cx(contextClassName, className)
   }, restContext, restProps)));
 };
-
 var RawItem = /*#__PURE__*/React.forwardRef(InternalRawItem);
 RawItem.displayName = 'RawItem';
 

package/esm/node_modules/rc-overflow/es/hooks/channelUpdate.js

@@ -0,0 +1,20 @@
+/**
+ * amis-ui v2.9.0
+ * Copyright 2018-2023 fex
+ */
+
+import wrapperRaf from '../../../rc-util/es/raf.js';
+
+function channelUpdate(callback) {
+  if (typeof MessageChannel === 'undefined') {
+    wrapperRaf(callback);
+  } else {
+    var channel = new MessageChannel();
+    channel.port1.onmessage = function () {
+      return callback();
+    };
+    channel.port2.postMessage(undefined);
+  }
+}
+
+export { channelUpdate as default };

package/esm/node_modules/rc-overflow/es/hooks/useEffectState.js

@@ -0,0 +1,53 @@
+/**
+ * amis-ui v2.9.0
+ * Copyright 2018-2023 fex
+ */
+
+import _slicedToArray from '../../../@babel/runtime/helpers/esm/slicedToArray.js';
+import useEvent from '../../../rc-util/es/hooks/useEvent.js';
+import * as React from 'react';
+import { unstable_batchedUpdates } from 'react-dom';
+import channelUpdate from './channelUpdate.js';
+
+/**
+ * Batcher for record any `useEffectState` need update.
+ */
+function useBatcher() {
+  // Updater Trigger
+  var updateFuncRef = React.useRef(null);
+  // Notify update
+  var notifyEffectUpdate = function notifyEffectUpdate(callback) {
+    if (!updateFuncRef.current) {
+      updateFuncRef.current = [];
+      channelUpdate(function () {
+        unstable_batchedUpdates(function () {
+          updateFuncRef.current.forEach(function (fn) {
+            fn();
+          });
+          updateFuncRef.current = null;
+        });
+      });
+    }
+    updateFuncRef.current.push(callback);
+  };
+  return notifyEffectUpdate;
+}
+/**
+ * Trigger state update by `useLayoutEffect` to save perf.
+ */
+function useEffectState(notifyEffectUpdate, defaultValue) {
+  // Value
+  var _React$useState = React.useState(defaultValue),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    stateValue = _React$useState2[0],
+    setStateValue = _React$useState2[1];
+  // Set State
+  var setEffectVal = useEvent(function (nextValue) {
+    notifyEffectUpdate(function () {
+      setStateValue(nextValue);
+    });
+  });
+  return [stateValue, setEffectVal];
+}
+
+export { useEffectState as default, useBatcher };

package/esm/node_modules/rc-overflow/es/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-resize-observer/es/Collection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-resize-observer/es/SingleObserver/DomWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-resize-observer/es/SingleObserver/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-resize-observer/es/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-resize-observer/es/utils/observerUtil.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/node_modules/rc-util/es/Children/toArray.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v2.9.0
  * Copyright 2018-2023 fex
  */