@opensumi/ide-core-browser 2.23.5-rc-1681807382.0 → 2.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/utils/label.d.ts.map +1 -1
  2. package/lib/utils/label.js +5 -2
  3. package/lib/utils/label.js.map +1 -1
  4. package/package.json +5 -5
  5. package/src/utils/label.tsx +10 -2
package/lib/utils/label.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../src/utils/label.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAO7C,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,GAAE,aAAa,GAAG,MAAW,EAC3C,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EACjD,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,OAsC7D"}
1
+ {"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../src/utils/label.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAO7C,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,GAAE,aAAa,GAAG,MAAW,EAC3C,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EACjD,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,OA8C7D"}
package/lib/utils/label.js CHANGED
@@ -13,7 +13,9 @@ function transformLabelWithCodicon(label, iconStyleProps = {}, transformer, rend
13
13
  // some string like $() $(~spin)
14
14
  const ICON_ERROR_REGX = /\$\(([a-z.]+\/)?([a-z-]+)?(~[a-z]+)?\)/gi;
15
15
  const generateIconStyle = (icon, styleProps) => typeof styleProps === 'string' ? { className: (0, classnames_1.default)(icon, styleProps) } : { className: icon, style: styleProps };
16
- return label.split(SEPERATOR).map((e, index) => {
16
+ const splitLabel = label.split(SEPERATOR);
17
+ const length = splitLabel.length;
18
+ return splitLabel.map((e, index) => {
17
19
  if (!transformer) {
18
20
  return e;
19
21
  }
@@ -35,7 +37,8 @@ function transformLabelWithCodicon(label, iconStyleProps = {}, transformer, rend
35
37
  return transformLabelWithCodicon(e.replaceAll(ICON_ERROR_REGX, ''), iconStyleProps, transformer, renderText);
36
38
  }
37
39
  else {
38
- return (0, ide_core_common_1.isFunction)(renderText) ? renderText(e, index) : react_1.default.createElement("span", { key: `${index}-${e}` }, e);
40
+ const withSeperator = e + (index === length - 1 ? '' : SEPERATOR);
41
+ return (0, ide_core_common_1.isFunction)(renderText) ? (renderText(withSeperator, index)) : (react_1.default.createElement("span", { key: `${index}-${e}` }, withSeperator));
39
42
  }
40
43
  });
41
44
  }
package/lib/utils/label.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/utils/label.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,0DAA6C;AAE7C,iEAA8D;AAC9D,+DAAuD;AAEvD,MAAM,SAAS,GAAG,GAAG,CAAC;AAEtB,SAAgB,yBAAyB,CACvC,KAAa,EACb,iBAAyC,EAAE,EAC3C,WAAiD,EACjD,UAA4D;IAE5D,MAAM,SAAS,GAAG,yCAAyC,CAAC;IAC5D,MAAM,sBAAsB,GAAG,wCAAwC,CAAC;IACxE,gCAAgC;IAChC,MAAM,eAAe,GAAG,0CAA0C,CAAC;IAEnE,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,UAAmC,EAAE,EAAE,CAC/E,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAA,oBAAG,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAEjH,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAC7C,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,CAAC;SACV;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,IAAI,EAAE;YACR,OAAO,8BAAC,WAAI,oBAAK,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,IAAE,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE,IAAI,CAAC;SACvF;aAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC5B,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,MAAM,CAAC,EAAE,AAAD,EAAG,IAAI,EAAE,OAAO,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACjE,IAAI,OAAO,IAAI,IAAI,EAAE;oBACnB,OAAO,CACL,8BAAC,WAAI,oBACC,iBAAiB,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,cAAc,CAAC,IAChE,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE,IACvB,CACH,CAAC;iBACH;aACF;YACD,MAAM,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC;YAC9E,OAAO,yBAAyB,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;SACvE;aAAM,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAClC,OAAO,yBAAyB,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;SAC9G;aAAM;YACL,OAAO,IAAA,4BAAU,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,wCAAM,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,IAAG,CAAC,CAAQ,CAAC;SAC/F;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA1CD,8DA0CC"}
1
+ {"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/utils/label.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,0DAA6C;AAE7C,iEAA8D;AAC9D,+DAAuD;AAEvD,MAAM,SAAS,GAAG,GAAG,CAAC;AAEtB,SAAgB,yBAAyB,CACvC,KAAa,EACb,iBAAyC,EAAE,EAC3C,WAAiD,EACjD,UAA4D;IAE5D,MAAM,SAAS,GAAG,yCAAyC,CAAC;IAC5D,MAAM,sBAAsB,GAAG,wCAAwC,CAAC;IACxE,gCAAgC;IAChC,MAAM,eAAe,GAAG,0CAA0C,CAAC;IAEnE,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,UAAmC,EAAE,EAAE,CAC/E,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAA,oBAAG,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAEjH,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,CAAC;SACV;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,IAAI,EAAE;YACR,OAAO,8BAAC,WAAI,oBAAK,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,IAAE,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE,IAAI,CAAC;SACvF;aAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC5B,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,MAAM,CAAC,EAAE,AAAD,EAAG,IAAI,EAAE,OAAO,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACjE,IAAI,OAAO,IAAI,IAAI,EAAE;oBACnB,OAAO,CACL,8BAAC,WAAI,oBACC,iBAAiB,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,cAAc,CAAC,IAChE,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE,IACvB,CACH,CAAC;iBACH;aACF;YACD,MAAM,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC;YAC9E,OAAO,yBAAyB,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;SACvE;aAAM,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAClC,OAAO,yBAAyB,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;SAC9G;aAAM;YACL,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAClE,OAAO,IAAA,4BAAU,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAC9B,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CACjC,CAAC,CAAC,CAAC,CACF,wCAAM,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,IAAG,aAAa,CAAQ,CACnD,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlDD,8DAkDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-core-browser",
3
- "version": "2.23.5-rc-1681807382.0",
3
+ "version": "2.24.0",
4
4
  "description": "@opensumi/ide-core-browser",
5
5
  "files": [
6
6
  "lib",
@@ -18,9 +18,9 @@
18
18
  "build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
19
19
  },
20
20
  "dependencies": {
21
- "@opensumi/ide-components": "2.23.5-rc-1681807382.0",
22
- "@opensumi/ide-connection": "2.23.5-rc-1681807382.0",
23
- "@opensumi/ide-core-common": "2.23.5-rc-1681807382.0",
21
+ "@opensumi/ide-components": "2.24.0",
22
+ "@opensumi/ide-connection": "2.24.0",
23
+ "@opensumi/ide-core-common": "2.24.0",
24
24
  "@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
25
25
  "@vscode/codicons": "0.0.27",
26
26
  "ajv": "^6.10.0",
@@ -50,5 +50,5 @@
50
50
  "peerDependencies": {
51
51
  "react": ">=16.8.6"
52
52
  },
53
- "gitHead": "9b66cc87f0e2ddc79fcfc7b3b0ec96a6a34e5537"
53
+ "gitHead": "502d5342d03791e740de237e01fe8724f2926438"
54
54
  }
package/src/utils/label.tsx CHANGED
@@ -20,7 +20,10 @@ export function transformLabelWithCodicon(
20
20
  const generateIconStyle = (icon?: string, styleProps?: CSSProperties | string) =>
21
21
  typeof styleProps === 'string' ? { className: clx(icon, styleProps) } : { className: icon, style: styleProps };
22
22
 
23
- return label.split(SEPERATOR).map((e, index) => {
23
+ const splitLabel = label.split(SEPERATOR);
24
+ const length = splitLabel.length;
25
+
26
+ return splitLabel.map((e, index) => {
24
27
  if (!transformer) {
25
28
  return e;
26
29
  }
@@ -45,7 +48,12 @@ export function transformLabelWithCodicon(
45
48
  } else if (ICON_ERROR_REGX.test(e)) {
46
49
  return transformLabelWithCodicon(e.replaceAll(ICON_ERROR_REGX, ''), iconStyleProps, transformer, renderText);
47
50
  } else {
48
- return isFunction(renderText) ? renderText(e, index) : <span key={`${index}-${e}`}>{e}</span>;
51
+ const withSeperator = e + (index === length - 1 ? '' : SEPERATOR);
52
+ return isFunction(renderText) ? (
53
+ renderText(withSeperator, index)
54
+ ) : (
55
+ <span key={`${index}-${e}`}>{withSeperator}</span>
56
+ );
49
57
  }
50
58
  });
51
59
  }