Skip to content

Commit

Permalink
fix: kebab menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@dougfabris
dougfabris committed Jun 14, 2022
1 parent 7990a01 commit df37f7a
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 11 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"@rocket.chat/emitter": "~0.31.12",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "0.31.13",
"@rocket.chat/fuselage": "0.32.0-dev.49",
"@rocket.chat/fuselage-hooks": "~0.31.12",
"@rocket.chat/fuselage-polyfills": "~0.31.12",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.22",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/04-main-elements-render.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ test.describe('[Main Elements Render]', function () {
});
});

test.describe.skip('[Members Tab]', () => {
test.describe('[Members Tab]', () => {
test.beforeAll(async () => {
await flexTab.operateFlexTab('members', true);
});
Expand Down
7 changes: 0 additions & 7 deletions apps/meteor/tests/e2e/utils/pageobjects/FlexTab.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,6 @@ export default class FlexTab extends BasePage {

await locator[tab].click();

// The button "more" keeps the focus when popover is closed from a click
// on an item, need to click again to change the status to unselected and
// allow the next click to open the popover again
if (more) {
await this.headerMoreActions().click();
}

if (desiredState) {
await expect(locator[panel]).toBeVisible();
} else {
Expand Down
84 changes: 82 additions & 2 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4324,6 +4324,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/css-in-js@npm:0.31.14-dev.2"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.14-dev.2
"@rocket.chat/memo": ~0.31.14-dev.2
"@rocket.chat/stylis-logical-props-middleware": ~0.31.14-dev.2
stylis: ~4.0.13
checksum: 2b8385be25da2a3bf131694e52edbf0fa094449a2ed8e3426eca4149be49dc3b703dea9d257c91d394089a8a9100eb4fad92d86b6aa4049a9f6b89fb3a08d474
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:^0.31.11":
version: 0.31.11
resolution: "@rocket.chat/css-supports@npm:0.31.11"
Expand Down Expand Up @@ -4351,6 +4364,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/css-supports@npm:0.31.14-dev.2"
dependencies:
"@rocket.chat/memo": ~0.31.14-dev.2
checksum: 0f57cfed074e734c592c0f49cd76f1f33bb373cef889e20e0dc63008b038f67dca5715aee3910c185438ee128c85196ee927f42035285ae2cbc48e2e7389f46d
languageName: node
linkType: hard

"@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer":
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
Expand Down Expand Up @@ -4572,6 +4594,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/fuselage-tokens@npm:0.31.14-dev.2"
checksum: cda2f7751699ddf14ac77a4902aeeacf8e2863e9a07481f48fbebb4d3ed36ca3dcc655586ca51e8dd7a5e8de613391c32d41961110f8c24a0cbee31fb69dd7a3
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:~0.31.14-dev.1":
version: 0.31.14-dev.1
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.14-dev.1"
Expand All @@ -4590,7 +4619,29 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:0.31.13, @rocket.chat/fuselage@npm:^0.31.13":
"@rocket.chat/fuselage@npm:0.32.0-dev.49":
version: 0.32.0-dev.49
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.49"
dependencies:
"@rocket.chat/css-in-js": ~0.31.14-dev.2
"@rocket.chat/css-supports": ~0.31.14-dev.2
"@rocket.chat/fuselage-tokens": ~0.31.14-dev.2
"@rocket.chat/memo": ~0.31.14-dev.2
"@rocket.chat/styled": ~0.31.14-dev.2
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/fuselage-polyfills": "*"
"@rocket.chat/icons": "*"
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: 53a45233f48819b6aa91f7e7cf9b4dfa37af219c2ceab73968b8c434dd281ea5233cc2c2c74991ab95f053451c0c9646a77b6381322205f0fddb298a6eb8aec7
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:^0.31.13":
version: 0.31.13
resolution: "@rocket.chat/fuselage@npm:0.31.13"
dependencies:
Expand Down Expand Up @@ -4757,6 +4808,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/memo@npm:0.31.14-dev.2"
checksum: e5892cec4e3137f7f84c51567aa90934c413a0b2deb520385e04646e626147b10a915f486304b4543a386ce83c38b0715d02bfce1d439231f15e60ba6500d220
languageName: node
linkType: hard

"@rocket.chat/message-parser@npm:next":
version: 0.31.14-dev.1
resolution: "@rocket.chat/message-parser@npm:0.31.14-dev.1"
Expand Down Expand Up @@ -4799,7 +4857,7 @@ __metadata:
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
"@rocket.chat/fuselage": 0.31.13
"@rocket.chat/fuselage": 0.32.0-dev.49
"@rocket.chat/fuselage-hooks": ~0.31.12
"@rocket.chat/fuselage-polyfills": ~0.31.12
"@rocket.chat/fuselage-toastbar": ^0.32.0-dev.22
Expand Down Expand Up @@ -5182,6 +5240,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/styled@npm:0.31.14-dev.2"
dependencies:
"@rocket.chat/css-in-js": ~0.31.14-dev.2
tslib: ^2.3.1
checksum: 792890b3c2f93e7d2f39065bb4b614bcf9525842566cabda60326f148ad81dd64f40ddaf5770a2cda01c847ee2ba6681ebf6e0403f7f1d11c879ee80dc6049c1
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.11":
version: 0.31.11
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11"
Expand Down Expand Up @@ -5218,6 +5286,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.14-dev.2":
version: 0.31.14-dev.2
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.14-dev.2"
dependencies:
"@rocket.chat/css-supports": ~0.31.14-dev.2
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: e3ed7b3bdab5f330045d1fc4f7d57e3086ba44e0dbdfd8b98c1f315a1662256815e2383f26c4a32838afeafa4d6aae5d40f8fca69b265655b3264d43f9af61b2
languageName: node
linkType: hard

"@rocket.chat/ui-contexts@workspace:^, @rocket.chat/ui-contexts@workspace:packages/ui-contexts":
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-contexts@workspace:packages/ui-contexts"
Expand Down

0 comments on commit df37f7a

Please sign in to comment.