apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regression: Toolbox render item (#23862)

Browse Source
pull/23901/head
Douglas Fabris 4 years ago committed by GitHub
parent 5d0bdf1409
commit 028ede9c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/theme/client/imports/components/popover.css
  2. 5
      app/ui-utils/client/lib/AccountBox.d.ts
  3. 2
      client/components/Message/Actions/Action.tsx
  4. 6
      client/sidebar/RoomList/Row.js
  5. 2
      client/views/room/Header/ToolBox/ToolBox.tsx
  6. 56
      package-lock.json
  7. 2
      package.json

4
app/theme/client/imports/components/popover.css
Unescape View File

@ -86,6 +86,8 @@
margin-bottom: 8px;
padding: 0 var(--popover-padding);
text-transform: uppercase;
color: var(--popover-title-color);
@ -100,7 +102,7 @@
width: 100%;
padding: 4px 12px;
padding: 4px var(--popover-padding);
cursor: pointer;

5
app/ui-utils/client/lib/AccountBox.d.ts vendored
Unescape View File

@ -1,3 +1,6 @@
import type { ComponentProps } from 'react';
import { Option } from '@rocket.chat/fuselage';
import { IUser } from '../../../../definition/IUser';
import { TranslationKey } from '../../../../client/contexts/TranslationContext';
@ -6,7 +9,7 @@ export declare const AccountBox: {
getItems: () => Array<{
condition: () => boolean;
name: TranslationKey;
icon: string;
icon: ComponentProps<typeof Option>['icon'];
sideNav: string;
href: string;
}>;

2
client/components/Message/Actions/Action.tsx
Unescape View File

@ -15,7 +15,7 @@ type ActionOptions = {
danger?: boolean;
};
const resolveLegacyIcon = (legacyIcon: string | undefined): string | undefined => {
const resolveLegacyIcon = (legacyIcon: IconProps['name']): IconProps['name'] => {
if (legacyIcon === 'icon-videocam') {
return 'video';
}

6
client/sidebar/RoomList/Row.js
Unescape View File

@ -1,4 +1,4 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { SidebarSection } from '@rocket.chat/fuselage';
import React, { memo } from 'react';
import Omnichannel from '../sections/Omnichannel';
@ -16,7 +16,9 @@ const Row = ({ data, item }) => {
return Section ? (
<Section aria-level='1' />
) : (
<Sidebar.Section.Title aria-level='1'>{t(item)}</Sidebar.Section.Title>
<SidebarSection aria-level='1'>
<SidebarSection.Title>{t(item)}</SidebarSection.Title>
</SidebarSection>
);
}
return (

2
client/views/room/Header/ToolBox/ToolBox.tsx
Unescape View File

@ -103,7 +103,7 @@ const ToolBox: FC<ToolBoxProps> = ({ className }) => {
tabIndex={-1}
options={hiddenActions}
renderItem={({ value, ...props }): ReactNode =>
props.id && hiddenActionRenderers.current[value || ''](props)
value && hiddenActionRenderers.current[value](props)
}
/>
)}

56
package-lock.json generated
Unescape View File

@ -5379,58 +5379,58 @@
}
},
"@rocket.chat/fuselage": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.364.tgz",
"integrity": "sha512-E391ik+GHVSiedvUQNA/rRD2P1JsPyO2ktvJGMN7z0ExolGUgVtth577RerVzyjH/VcI3LM5e7FeYBdn33VKEA==",
"requires": {
"@rocket.chat/css-in-js": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/css-supports": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/memo": "^0.6.3-dev.364+c2b02aa4",
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.368.tgz",
"integrity": "sha512-sSTnYDpQXWSY6Q/ZxiXJPaRNzmrdC9U65bJ8067pcGBrafznjlknPl6L2yGH7b8slgKHxdDyPRpyfmCvPpY1/w==",
"requires": {
"@rocket.chat/css-in-js": "^0.6.3-dev.368+a3e8f4db",
"@rocket.chat/css-supports": "^0.6.3-dev.368+a3e8f4db",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.368+a3e8f4db",
"@rocket.chat/memo": "^0.6.3-dev.368+a3e8f4db",
"invariant": "^2.2.4",
"react-keyed-flatten-children": "^1.3.0"
},
"dependencies": {
"@rocket.chat/css-in-js": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.364.tgz",
"integrity": "sha512-NHdVoFzESe4S9sqUX8BPbUzxX8xxv4iguHnqzLhomglnLhd5Vb6ND6H4K00tbHC2G9V50sXDAM7efN5xhHb7sw==",
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.368.tgz",
"integrity": "sha512-kWsQKBhPi7L0pxPvuY1NIw7eA+JfHXiXI3UotVr7uj6W1bN525gzVEhIyrtcVxTCpHCbj+BhXd/obLJzu8YlEQ==",
"requires": {
"@emotion/hash": "^0.8.0",
"@rocket.chat/css-supports": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/memo": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/stylis-logical-props-middleware": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/css-supports": "^0.6.3-dev.368+a3e8f4db",
"@rocket.chat/memo": "^0.6.3-dev.368+a3e8f4db",
"@rocket.chat/stylis-logical-props-middleware": "^0.6.3-dev.368+a3e8f4db",
"stylis": "^4.0.10"
}
},
"@rocket.chat/css-supports": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-supports/-/css-supports-0.6.3-dev.364.tgz",
"integrity": "sha512-GHzTZRG5nkvqtakGJnmOKUcl2Oi+zhDYTszzPnEyQI6kLMjLRkA9tK3Pqn2BO1AE03JJnA7InojjzYwPs4vgJA==",
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-supports/-/css-supports-0.6.3-dev.368.tgz",
"integrity": "sha512-S5fz7R2UwG2pA07SooyNqPhH5MFeJCooZyhQm3NVLJU+YQMT/n71ZjE2ekRTQfQ90EsuP53ATltlxKPujsb7pQ==",
"requires": {
"@rocket.chat/memo": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/memo": "^0.6.3-dev.368+a3e8f4db",
"tslib": "^2.3.1"
}
},
"@rocket.chat/fuselage-tokens": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.364.tgz",
"integrity": "sha512-n0LgpvQWkACOLc0E3j8X0UEO6VHlVXgDWgN4yIIQfNT2FI0OUxhoCoedYFymLxg3E+DmUrI3EMr76O5Gp1AbLg=="
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.368.tgz",
"integrity": "sha512-vEFqdg1L/W5qKP8oFuRgR7hLNkxYLwvonVzVlQLtFb5Byc2g+7I+IQz4AVdA16cQ3uU5c37uIpvL459IsroGEQ=="
},
"@rocket.chat/memo": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.364.tgz",
"integrity": "sha512-vF7drq9tjcH8e0fbWYVkIJsCrNvTrtnC+ZgLgFDqyjWvOJWrw33QkVg7ytb0aCGXpR+YSCtDJ9gAAmE4ho4pkg==",
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.368.tgz",
"integrity": "sha512-sBorvHQp5go0g8L21+x4V7OWKtHVQlb9rsirgNYUkD6qEghg2qkrjQhbH1t6s9yLjg3qBW7LrMtRkA52zjmXnQ==",
"requires": {
"tslib": "^2.3.1"
}
},
"@rocket.chat/stylis-logical-props-middleware": {
"version": "0.6.3-dev.364",
"resolved": "https://registry.npmjs.org/@rocket.chat/stylis-logical-props-middleware/-/stylis-logical-props-middleware-0.6.3-dev.364.tgz",
"integrity": "sha512-kW+17VjAmumvhIxrKpLNw0O3S1wjROOKCtPqhzsvIEU5ONqaOV4xzc8z4kX6SmXLaOj/TYhbKRNrivblAP1bOw==",
"version": "0.6.3-dev.368",
"resolved": "https://registry.npmjs.org/@rocket.chat/stylis-logical-props-middleware/-/stylis-logical-props-middleware-0.6.3-dev.368.tgz",
"integrity": "sha512-wZmZGKnxzyXktO/gwD17bYcs+Fx9Brv2ZFAQ2fC2kwHF5Tz/vzl9ZoR89SLLAZMwATt2HcJ7R1QL7DRU03HqzA==",
"requires": {
"@rocket.chat/css-supports": "^0.6.3-dev.364+c2b02aa4",
"@rocket.chat/css-supports": "^0.6.3-dev.368+a3e8f4db",
"tslib": "^2.3.1"
}
},

2
package.json
Unescape View File

@ -176,7 +176,7 @@
"@rocket.chat/apps-engine": "^1.28.1",
"@rocket.chat/css-in-js": "^0.30.1",
"@rocket.chat/emitter": "^0.30.1",
"@rocket.chat/fuselage": "^0.6.3-dev.364",
"@rocket.chat/fuselage": "^0.6.3-dev.368",
"@rocket.chat/fuselage-hooks": "^0.6.3-dev.362",
"@rocket.chat/fuselage-polyfills": "^0.30.1",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.362",

Write Preview
Loading…
Cancel
Save