This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 66d8d32

committed

fix(context): fix problem which unmount comp after location change in AsyncRegionList

1 parent 9007928 commit 66d8d32Copy full SHA for 66d8d32

File tree

+15

-5

lines changed

packages/console-utils/xconsole-context
- package.json
- src
  - withConsoleContext.tsx

+15

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@alicloud/xconsole-context",`
`3`		`- "version": "2.5.1",`
	`3`	`+ "version": "2.5.2",`
`4`	`4`	`"main": "lib/index.js",`
`5`	`5`	`"module": "es/index.js",`
`6`	`6`	`"types": "lib/index.d.ts",`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import React, { useEffect, useState, useRef } from 'react';`
	`1`	`+import React, { useEffect, useLayoutEffect,useState, useRef } from 'react';`
`2`	`2`	`import isFunction from 'lodash/isFunction';`
`3`	`3`	`import { matchPath } from 'react-router-dom';`
`4`	`4`	`import ConsoleBaseMessengerRegion from '@alicloud/console-base-rc-messenger-region';`
`@@ -90,12 +90,22 @@ function withAsyncRegionList<P extends IConsoleContextProp>(`
`90`	`90`
`91`	`91`	`const { customPaths = [] } = appConfig?.aplus \|\| {};`
`92`	`92`
`93`		`- useEffect(() => {`
	`93`	`+ useLayoutEffect(() => {`
`94`	`94`	`(async () => {`
`95`	`95`	`if (isFunction(userRegionListConfig)) {`
`96`		`- setLoading(true);`
`97`	`96`	`const regions = await (userRegionListConfig as (location) => Promise<IPayloadRegion[]>)(props.location);`
`98`		`- setRegionList(regions);`
	`97`	`+ setRegionList((curRegions) => {`
	`98`	`+ // diff regions`
	`99`	`+ try {`
	`100`	`+ if (JSON.stringify(curRegions) !== JSON.stringify(regions)) {`
	`101`	`+ return regions;`
	`102`	`+ }`
	`103`	`+ } catch (e) {`
	`104`	`+ console.error('The regionList from is not valid.');`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ return curRegions;`
	`108`	`+ });`
`99`	`109`	`setLoading(false);`
`100`	`110`	`}`
`101`	`111`	`})();`

Comments

(0)