Skip to content

Commit

Permalink
fix(layout): AppsLogo stopPropagation
Browse files Browse the repository at this point in the history 
close #5987
  • Loading branch information
@chenshuai2144
chenshuai2144 committed Oct 14, 2022
1 parent 1c6c7ef commit 2235842
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 66 deletions.
8 changes: 7 additions & 1 deletion packages/layout/src/components/AppsLogoComponents/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,13 @@ export const AppsLogoComponents: React.FC<{

return wrapSSR(
<>
<div ref={ref} />
<div
ref={ref}
onClick={(e) => {
e.stopPropagation();
e.preventDefault();
}}
/>
<Popover
placement="bottomRight"
trigger={['click']}
Expand Down
130 changes: 65 additions & 65 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1583,10 +1583,10 @@
unique-filename "^1.1.1"
which "^1.3.1"

"@formatjs/ecma402-abstract@1.12.0":
version "1.12.0"
resolved "https://registry.npmmirror.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.12.0.tgz#2fb5e8983d5fae2fad9ec6c77aec1803c2b88d8e"
integrity sha512-0/wm9b7brUD40kx7KSE0S532T8EfH06Zc41rGlinoNyYXnuusR6ull2x63iFJgVXgwahm42hAW7dcYdZ+llZzA==
"@formatjs/ecma402-abstract@1.13.0":
version "1.13.0"
resolved "https://registry.npmmirror.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.13.0.tgz#df6db3cbee0182bbd2fd6217103781c802aee819"
integrity sha512-CQ8Ykd51jYD1n05dtoX6ns6B9n/+6ZAxnWUAonvHC4kkuAemROYBhHkEB4tm1uVrRlE7gLDqXkAnY51Y0pRCWQ==
dependencies:
"@formatjs/intl-localematcher" "0.2.31"
tslib "2.4.0"
Expand All @@ -1598,38 +1598,38 @@
dependencies:
tslib "2.4.0"

"@formatjs/icu-messageformat-parser@2.1.8":
version "2.1.8"
resolved "https://registry.npmmirror.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.8.tgz#45cb678da4c760009b52fe6ca2c13aedbc200fee"
integrity sha512-T1R/UtPSCdznwjlfIJDl9XnjZdcFap+rPJrKC9uATr/sUdziVad3SfRQFf50JOuHptbk6knz+VdiYdApek4Sag==
"@formatjs/icu-messageformat-parser@2.1.9":
version "2.1.9"
resolved "https://registry.npmmirror.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.9.tgz#abd5ba32ad9f2f5226e0b78e0313ecf438835c30"
integrity sha512-KFwi1cDZ6sFbsZ6xuXpg/UtdVtcwmpEt2WY355k33Z+3fpzRe1EulwX65qEoho0af3+ZsiJxuhIvUIlSSFWASg==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/icu-skeleton-parser" "1.3.13"
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/icu-skeleton-parser" "1.3.14"
tslib "2.4.0"

"@formatjs/icu-skeleton-parser@1.3.13":
version "1.3.13"
resolved "https://registry.npmmirror.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.13.tgz#f7e186e72ed73c3272d22a3aacb646e77368b099"
integrity sha512-qb1kxnA4ep76rV+d9JICvZBThBpK5X+nh1dLmmIReX72QyglicsaOmKEcdcbp7/giCWfhVs6CXPVA2JJ5/ZvAw==
"@formatjs/icu-skeleton-parser@1.3.14":
version "1.3.14"
resolved "https://registry.npmmirror.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.14.tgz#b99ef7f855f8a58cab2519ec4f921f11c2bf74a7"
integrity sha512-7bv60HQQcBb3+TSj+45tOb/CHV5z1hOpwdtS50jsSBXfB+YpGhnoRsZxSRksXeCxMy6xn6tA6VY2601BrrK+OA==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/ecma402-abstract" "1.13.0"
tslib "2.4.0"

"@formatjs/intl-displaynames@6.1.3":
version "6.1.3"
resolved "https://registry.npmmirror.com/@formatjs/intl-displaynames/-/intl-displaynames-6.1.3.tgz#c9d283db518cd721c0855e9854bfadb9ba304b6a"
integrity sha512-yBB165IH72fweGymRPrq8PQ4R5gKMR8vOj6XmkxGBICyJMhknc+RpG02g9Jsk/4jvO6qw/H0QtXHrHIg+Jv0sw==
"@formatjs/intl-displaynames@6.1.4":
version "6.1.4"
resolved "https://registry.npmmirror.com/@formatjs/intl-displaynames/-/intl-displaynames-6.1.4.tgz#26b2c7b814f5132b2e6d781bf4af7bce86f46852"
integrity sha512-sEbziGLsWQo6nA8ZUBcsDRlZzPg+uMVjDmbTalgGqRWLbdXuxMldTYdaCK+UptyJhkmNVM/erz3csTiyqamXHQ==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/intl-localematcher" "0.2.31"
tslib "2.4.0"

"@formatjs/intl-listformat@7.1.2":
version "7.1.2"
resolved "https://registry.npmmirror.com/@formatjs/intl-listformat/-/intl-listformat-7.1.2.tgz#3c5145436434795fa834150d0b6b6dc577aa6964"
integrity sha512-WfWkJ8k41jZIhXgBtC2T1SpTSKYig99g9MVqrVRco4kduv/6GUWq1eMjk84qZfbU4rwdwc8qct+/gB6DTS17+w==
"@formatjs/intl-listformat@7.1.3":
version "7.1.3"
resolved "https://registry.npmmirror.com/@formatjs/intl-listformat/-/intl-listformat-7.1.3.tgz#e2bda750a46d2a90d7fa023b02a984588978829c"
integrity sha512-rs0Kxl78PeRCedx2cmFoBqcun2Kf0bCQrF8ycna54sfePpDhMskvODWeI4G/xBioW01FjK7CJSvtJJ87hrr79A==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/intl-localematcher" "0.2.31"
tslib "2.4.0"

Expand All @@ -1640,17 +1640,17 @@
dependencies:
tslib "2.4.0"

"@formatjs/intl@2.4.2":
version "2.4.2"
resolved "https://registry.npmmirror.com/@formatjs/intl/-/intl-2.4.2.tgz#a2ae882cfd840391f6c319d241d449437511c285"
integrity sha512-RuZT+fecObhWA4CuoDolftfbEYn1yaqTG4yiTSX7W6vnvAupZOqyZXctzebtQ9pDhm6uHHNQSLQ0NL3Y8pCi9g==
"@formatjs/intl@2.5.0":
version "2.5.0"
resolved "https://registry.npmmirror.com/@formatjs/intl/-/intl-2.5.0.tgz#1c503a8a8b1d92f6beb4647da7ad10d2bd997fd0"
integrity sha512-jVTYwxmKTvaz/4XBGzqm3OPbInt3o6EYBjPhLKtlaOJvvmCR+HjM6B8d4cYcfawvPWf7xMaT4rOSv1iIakDcHw==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/fast-memoize" "1.2.6"
"@formatjs/icu-messageformat-parser" "2.1.8"
"@formatjs/intl-displaynames" "6.1.3"
"@formatjs/intl-listformat" "7.1.2"
intl-messageformat "10.1.5"
"@formatjs/icu-messageformat-parser" "2.1.9"
"@formatjs/intl-displaynames" "6.1.4"
"@formatjs/intl-listformat" "7.1.3"
intl-messageformat "10.2.0"
tslib "2.4.0"

"@gar/promisify@^1.0.1":
Expand Down Expand Up @@ -2095,9 +2095,9 @@
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==

"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
version "0.3.16"
resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz#a7982f16c18cae02be36274365433e5b49d7b23f"
integrity sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==
version "0.3.17"
resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
dependencies:
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
Expand Down Expand Up @@ -5511,9 +5511,9 @@ aws-lambda@^1.0.7:
watchpack "^2.0.0-beta.10"

aws-sdk@^2.814.0:
version "2.1231.0"
resolved "https://registry.npmmirror.com/aws-sdk/-/aws-sdk-2.1231.0.tgz#c02e83b095211d9f6dfb540fd47fa69190af9c0d"
integrity sha512-ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg==
version "2.1232.0"
resolved "https://registry.npmmirror.com/aws-sdk/-/aws-sdk-2.1232.0.tgz#11d38fda396e020000f69c502433bd8d004f6c68"
integrity sha512-hpWsIdfyIK8uVWzCAHAqa3V2P/pkDy5SHy2QytpY/HylT2TnMT9NNd5hblfpvttfoIKoArnYQzVKtC20H/+yUg==
dependencies:
buffer "4.9.2"
events "1.1.1"
Expand Down Expand Up @@ -8569,9 +8569,9 @@ eslint-plugin-jest@^24.0.1:
"@typescript-eslint/experimental-utils" "^4.0.1"

eslint-plugin-promise@^6.0.0:
version "6.0.1"
resolved "https://registry.npmmirror.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz#a8cddf96a67c4059bdabf4d724a29572188ae423"
integrity sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==
version "6.1.0"
resolved "https://registry.npmmirror.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.0.tgz#99e54d07272df5a6440209cb36d0d692be0610dd"
integrity sha512-NYCfDZF/KHt27p06nFAttgWuFyIDSUMnNaJBIY1FY9GpBFhdT2vMG64HlFguSgcJeyM5by6Yr5csSOuJm60eXQ==

eslint-plugin-react-hooks@^4.1.2:
version "4.6.0"
Expand Down Expand Up @@ -11003,14 +11003,14 @@ interpret@^2.2.0:
resolved "https://registry.npmmirror.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==

intl-messageformat@10.1.5:
version "10.1.5"
resolved "https://registry.npmmirror.com/intl-messageformat/-/intl-messageformat-10.1.5.tgz#ec053e0367ee5e4d40a9448ddbb9fff143266a9d"
integrity sha512-bDQz81oQ6TkQp1pSnlBK36ahGL5/tLb0+3hSiG/1/SnVbz5NWPQTqaPx2cT7nmGujDrPn9pQ0ik8RWE8v1lzEw==
intl-messageformat@10.2.0:
version "10.2.0"
resolved "https://registry.npmmirror.com/intl-messageformat/-/intl-messageformat-10.2.0.tgz#2aa86e90cbb5fa1b4b537b120501cad863c8ac5b"
integrity sha512-VndSbrryShPRnFvEB81rt2DvbEmygRfuM9+6gdu9TXxTFX0m3Pyk8EvKUEBNhZ1/19JyOvFsRhvg+p6K64ohKA==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/fast-memoize" "1.2.6"
"@formatjs/icu-messageformat-parser" "2.1.8"
"@formatjs/icu-messageformat-parser" "2.1.9"
tslib "2.4.0"

invariant@^2.2.4:
Expand Down Expand Up @@ -17560,19 +17560,19 @@ react-helmet-async@^1.0.9:
shallowequal "^1.1.0"

react-intl@*:
version "6.1.2"
resolved "https://registry.npmmirror.com/react-intl/-/react-intl-6.1.2.tgz#31ef6f0f2ed6e51910d4c1e7e27fb43fe7895b57"
integrity sha512-42Kkne7QzXjvljZQ3/ilWz5dHooG2cfgwmZbhtn90gZtUKzmyxRU11Os8nZvCuuLCW1vnecHTjsbBP+7Wpbp6g==
dependencies:
"@formatjs/ecma402-abstract" "1.12.0"
"@formatjs/icu-messageformat-parser" "2.1.8"
"@formatjs/intl" "2.4.2"
"@formatjs/intl-displaynames" "6.1.3"
"@formatjs/intl-listformat" "7.1.2"
version "6.2.0"
resolved "https://registry.npmmirror.com/react-intl/-/react-intl-6.2.0.tgz#6c9c4aef774c8e9b053a44b87bc6bf70167e05e5"
integrity sha512-INCbPsPE9aC4AZ9de8YHMFecd5ruKFE9CKjmiidKYhRnA4Gd1/FJjLrZRefv549BJBb+ebwMFa5eIvgAr37vAw==
dependencies:
"@formatjs/ecma402-abstract" "1.13.0"
"@formatjs/icu-messageformat-parser" "2.1.9"
"@formatjs/intl" "2.5.0"
"@formatjs/intl-displaynames" "6.1.4"
"@formatjs/intl-listformat" "7.1.3"
"@types/hoist-non-react-statics" "^3.3.1"
"@types/react" "16 || 17 || 18"
hoist-non-react-statics "^3.3.2"
intl-messageformat "10.1.5"
intl-messageformat "10.2.0"
tslib "2.4.0"

react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.6:
Expand Down Expand Up @@ -17896,9 +17896,9 @@ regenerator-runtime@^0.11.0:
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==

regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
version "0.13.9"
resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
version "0.13.10"
resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"
integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==

regenerator-transform@^0.15.0:
version "0.15.0"
Expand Down Expand Up @@ -18779,9 +18779,9 @@ shebang-regex@^3.0.0:
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==

shell-quote@^1.6.1:
version "1.7.3"
resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
version "1.7.4"
resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8"
integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==

shellwords@^0.1.1:
version "0.1.1"
Expand Down

0 comments on commit 2235842

Please sign in to comment.