@opensumi/ide-components 2.20.10 → 2.20.11-rc-1667302771.0

package/dist/index.js

@@ -230,7 +230,7 @@ function __generator(thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -2369,7 +2369,7 @@ exports.setLogger = function setLogger(loggerFunction) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.containsUppercaseCharacter = exports.fuzzyContains = exports.repeat = exports.safeBtoa = exports.stripUTF8BOM = exports.startsWithUTF8BOM = exports.UTF8_BOM_CHARACTER = exports.removeAccents = exports.removeAnsiEscapeCodes = exports.lcut = exports.isFullWidthCharacter = exports.containsFullWidthCharacter = exports.isBasicASCII = exports.containsEmoji = exports.containsRTL = exports.isLowSurrogate = exports.isHighSurrogate = exports.overlap = exports.commonSuffixLength = exports.commonPrefixLength = exports.startsWithIgnoreCase = exports.equalsIgnoreCase = exports.isUpperAsciiLetter = exports.isLowerAsciiLetter = exports.compareIgnoreCase = exports.compare = exports.lastNonWhitespaceIndex = exports.getLeadingWhitespace = exports.firstNonWhitespaceIndex = exports.regExpFlags = exports.regExpContainsBackreference = exports.regExpLeadsToEndlessLoop = exports.createRegExp = exports.endsWith = exports.startsWith = exports.stripWildcards = exports.convertSimple2RegExpPattern = exports.rtrim = exports.multiRightTrim = exports.ltrim = exports.trim = exports.count = exports.escapeRegExpCharacters = exports.escape = exports.mnemonicButtonLabel = exports.format = exports.pad = exports.isFalsyOrWhitespace = exports.stringUtils = exports.empty = void 0;
-exports.decodeUTF8 = exports.encodeUTF8 = exports.getNextCodePoint = exports.computeCodePoint = exports.getNLines = exports.uppercaseFirstLetter = void 0;
+exports.template = exports.decodeUTF8 = exports.encodeUTF8 = exports.getNextCodePoint = exports.computeCodePoint = exports.getNLines = exports.uppercaseFirstLetter = void 0;
 const platform_1 = __webpack_require__(43);
 /**
  * The empty string.
@@ -3223,6 +3223,72 @@ function decodeUTF8(buffer) {
     return result.join('');
 }
 exports.decodeUTF8 = decodeUTF8;
+/**
+ * 插值表达式的标记使用的是 ${}
+ * 该函数会对 options 中的 separator 会有特殊处理，
+ */
+function template(tpl, variables, options) {
+    const result = [];
+    let placeHolderStack = [];
+    for (let idx = 0; idx < tpl.length; idx++) {
+        const char = tpl[idx];
+        const nextChar = tpl[idx + 1];
+        // 往后多看一位
+        if (char === '$' && nextChar === '{') {
+            // 往后的可能是占位符了，注入进栈标志位（即 $）
+            // 如果 placeHolder 栈已经有值了，现在不支持嵌套 ${}，直接吐出所有值放到 result 中即可
+            if (placeHolderStack.length > 0) {
+                result.push(...placeHolderStack);
+                placeHolderStack = [];
+            }
+            placeHolderStack.push(char);
+            placeHolderStack.push(nextChar);
+            idx++;
+            continue;
+        }
+        // 如果当前 placeHolder 栈有字符，一直将字符入栈，直到匹配到 }
+        if (placeHolderStack.length > 0) {
+            if (char === '}') {
+                // 占位符匹配结束
+                // 拿出占位符进行值替换
+                const placeholder = placeHolderStack.slice(2).join('');
+                let v;
+                if (placeholder === 'separator') {
+                    if (result[result.length - 1] === options.separator) {
+                        // 不需要重复 separator
+                        placeHolderStack = [];
+                        continue;
+                    }
+                    // 分隔符有单独的优化
+                    v = options.separator;
+                }
+                else {
+                    v = variables[placeholder];
+                }
+                const toPush = v !== null && v !== void 0 ? v : options.defaultValue;
+                if (toPush) {
+                    result.push(toPush);
+                }
+                placeHolderStack = [];
+            }
+            else {
+                placeHolderStack.push(char);
+            }
+            continue;
+        }
+        result.push(tpl[idx]);
+    }
+    // 去除前面和后面的 sep
+    // 这些 sep 也是不需要的
+    while (result[result.length - 1] === options.separator) {
+        result.pop();
+    }
+    while (result[0] === options.separator) {
+        result.shift();
+    }
+    return result.join('');
+}
+exports.template = template;
 //# sourceMappingURL=strings.js.map
 
 /***/ }),
@@ -21332,17 +21398,34 @@ function createListComponent(_ref) {
         align = 'auto';
       }
 
-      var itemCount = this.props.itemCount;
+      var _this$props2 = this.props,
+          itemCount = _this$props2.itemCount,
+          layout = _this$props2.layout;
       var scrollOffset = this.state.scrollOffset;
-      index = Math.max(0, Math.min(index, itemCount - 1));
-      this.scrollTo(getOffsetForIndexAndAlignment(this.props, index, align, scrollOffset, this._instanceProps));
+      index = Math.max(0, Math.min(index, itemCount - 1)); // The scrollbar size should be considered when scrolling an item into view, to ensure it's fully visible.
+      // But we only need to account for its size when it's actually visible.
+      // This is an edge case for lists; normally they only scroll in the dominant direction.
+
+      var scrollbarSize = 0;
+
+      if (this._outerRef) {
+        var outerRef = this._outerRef;
+
+        if (layout === 'vertical') {
+          scrollbarSize = outerRef.scrollWidth > outerRef.clientWidth ? getScrollbarSize() : 0;
+        } else {
+          scrollbarSize = outerRef.scrollHeight > outerRef.clientHeight ? getScrollbarSize() : 0;
+        }
+      }
+
+      this.scrollTo(getOffsetForIndexAndAlignment(this.props, index, align, scrollOffset, this._instanceProps, scrollbarSize));
     };
 
     _proto.componentDidMount = function componentDidMount() {
-      var _this$props2 = this.props,
-          direction = _this$props2.direction,
-          initialScrollOffset = _this$props2.initialScrollOffset,
-          layout = _this$props2.layout;
+      var _this$props3 = this.props,
+          direction = _this$props3.direction,
+          initialScrollOffset = _this$props3.initialScrollOffset,
+          layout = _this$props3.layout;
 
       if (typeof initialScrollOffset === 'number' && this._outerRef != null) {
         var outerRef = this._outerRef; // TODO Deprecate direction "horizontal"
@@ -21358,9 +21441,9 @@ function createListComponent(_ref) {
     };
 
     _proto.componentDidUpdate = function componentDidUpdate() {
-      var _this$props3 = this.props,
-          direction = _this$props3.direction,
-          layout = _this$props3.layout;
+      var _this$props4 = this.props,
+          direction = _this$props4.direction,
+          layout = _this$props4.layout;
       var _this$state = this.state,
           scrollOffset = _this$state.scrollOffset,
           scrollUpdateWasRequested = _this$state.scrollUpdateWasRequested;
@@ -21406,24 +21489,24 @@ function createListComponent(_ref) {
     };
 
     _proto.render = function render() {
-      var _this$props4 = this.props,
-          children = _this$props4.children,
-          className = _this$props4.className,
-          direction = _this$props4.direction,
-          height = _this$props4.height,
-          innerRef = _this$props4.innerRef,
-          innerElementType = _this$props4.innerElementType,
-          innerTagName = _this$props4.innerTagName,
-          itemCount = _this$props4.itemCount,
-          itemData = _this$props4.itemData,
-          _this$props4$itemKey = _this$props4.itemKey,
-          itemKey = _this$props4$itemKey === void 0 ? defaultItemKey$1 : _this$props4$itemKey,
-          layout = _this$props4.layout,
-          outerElementType = _this$props4.outerElementType,
-          outerTagName = _this$props4.outerTagName,
-          style = _this$props4.style,
-          useIsScrolling = _this$props4.useIsScrolling,
-          width = _this$props4.width;
+      var _this$props5 = this.props,
+          children = _this$props5.children,
+          className = _this$props5.className,
+          direction = _this$props5.direction,
+          height = _this$props5.height,
+          innerRef = _this$props5.innerRef,
+          innerElementType = _this$props5.innerElementType,
+          innerTagName = _this$props5.innerTagName,
+          itemCount = _this$props5.itemCount,
+          itemData = _this$props5.itemData,
+          _this$props5$itemKey = _this$props5.itemKey,
+          itemKey = _this$props5$itemKey === void 0 ? defaultItemKey$1 : _this$props5$itemKey,
+          layout = _this$props5.layout,
+          outerElementType = _this$props5.outerElementType,
+          outerTagName = _this$props5.outerTagName,
+          style = _this$props5.style,
+          useIsScrolling = _this$props5.useIsScrolling,
+          width = _this$props5.width;
       var isScrolling = this.state.isScrolling; // TODO Deprecate direction "horizontal"
 
       var isHorizontal = direction === 'horizontal' || layout === 'horizontal';
@@ -21504,9 +21587,9 @@ function createListComponent(_ref) {
     ;
 
     _proto._getRangeToRender = function _getRangeToRender() {
-      var _this$props5 = this.props,
-          itemCount = _this$props5.itemCount,
-          overscanCount = _this$props5.overscanCount;
+      var _this$props6 = this.props,
+          itemCount = _this$props6.itemCount,
+          overscanCount = _this$props6.overscanCount;
       var _this$state3 = this.state,
           isScrolling = _this$state3.isScrolling,
           scrollDirection = _this$state3.scrollDirection,
@@ -21662,7 +21745,7 @@ var VariableSizeList = /*#__PURE__*/createListComponent({
     return instanceProps.itemMetadataMap[index].size;
   },
   getEstimatedTotalSize: index_esm_getEstimatedTotalSize,
-  getOffsetForIndexAndAlignment: function getOffsetForIndexAndAlignment(props, index, align, scrollOffset, instanceProps) {
+  getOffsetForIndexAndAlignment: function getOffsetForIndexAndAlignment(props, index, align, scrollOffset, instanceProps, scrollbarSize) {
     var direction = props.direction,
         height = props.height,
         layout = props.layout,
@@ -21675,7 +21758,7 @@ var VariableSizeList = /*#__PURE__*/createListComponent({
 
     var estimatedTotalSize = index_esm_getEstimatedTotalSize(props, instanceProps);
     var maxOffset = Math.max(0, Math.min(estimatedTotalSize - size, itemMetadata.offset));
-    var minOffset = Math.max(0, itemMetadata.offset - size + itemMetadata.size);
+    var minOffset = Math.max(0, itemMetadata.offset - size + itemMetadata.size + scrollbarSize);
 
     if (align === 'smart') {
       if (scrollOffset >= minOffset - size && scrollOffset <= maxOffset + size) {
@@ -21951,7 +22034,7 @@ var FixedSizeList = /*#__PURE__*/createListComponent({
         itemSize = _ref3.itemSize;
     return itemSize * itemCount;
   },
-  getOffsetForIndexAndAlignment: function getOffsetForIndexAndAlignment(_ref4, index, align, scrollOffset) {
+  getOffsetForIndexAndAlignment: function getOffsetForIndexAndAlignment(_ref4, index, align, scrollOffset, instanceProps, scrollbarSize) {
     var direction = _ref4.direction,
         height = _ref4.height,
         itemCount = _ref4.itemCount,
@@ -21963,7 +22046,7 @@ var FixedSizeList = /*#__PURE__*/createListComponent({
     var size = isHorizontal ? width : height;
     var lastItemOffset = Math.max(0, itemCount * itemSize - size);
     var maxOffset = Math.min(lastItemOffset, index * itemSize);
-    var minOffset = Math.max(0, index * itemSize - size + itemSize);
+    var minOffset = Math.max(0, index * itemSize - size + itemSize + scrollbarSize);
 
     if (align === 'smart') {
       if (scrollOffset >= minOffset - size && scrollOffset <= maxOffset + size) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-components",
-  "version": "2.20.10",
+  "version": "2.20.11-rc-1667302771.0",
   "description": "@opensumi/ide-components",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.6.4",
-    "@opensumi/ide-utils": "2.20.10",
+    "@opensumi/ide-utils": "2.20.11-rc-1667302771.0",
     "@types/react-window": "^1.8.5",
     "fuzzy": "^0.1.3",
     "lodash": "^4.17.15",
@@ -37,5 +37,5 @@
     "@opensumi/ide-dev-tool": "^1.3.1",
     "@types/marked": "^4.0.7"
   },
-  "gitHead": "2ab5cd23d0b226943cc30b2d7d33cf32f015c33e"
+  "gitHead": "025803dbd0895673e8374e31daea06132c56cafc"
 }