From de75dacadc556c587bad0006638aab89a21ed7e0 Mon Sep 17 00:00:00 2001 From: Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:15:57 -0400 Subject: updated to v54 of comp library --- package-lock.json | 6 +++--- package.json | 2 +- src/client/views/nodes/button/FontIconBox.tsx | 8 +++++--- src/client/views/topbar/TopBar.tsx | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66ac0fca2..bae345949 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6195,9 +6195,9 @@ } }, "browndash-components": { - "version": "0.0.52", - "resolved": "https://registry.npmjs.org/browndash-components/-/browndash-components-0.0.52.tgz", - "integrity": "sha512-rnlHX+h0TQkNLhbS533k4nmPOSyapGHyA7rp0sJw9kzNmjt7Xk75djfimgyoTElU37/k67KKaHnEwaSRro3x3g==", + "version": "0.0.54", + "resolved": "https://registry.npmjs.org/browndash-components/-/browndash-components-0.0.54.tgz", + "integrity": "sha512-cwwghwtCtdgbU1eWDH/Ptq03CsQObIjRfK5gcQJsQFS4MrY68ldvTQJnonsuFWJUBXuCIW8I/mBRE92yikYdng==", "requires": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", diff --git a/package.json b/package.json index 45da1e5f4..8ad11054c 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,7 @@ "body-parser": "^1.19.2", "bootstrap": "^4.6.1", "brotli": "^1.3.3", - "browndash-components": "0.0.52", + "browndash-components": "0.0.54", "browser-assert": "^1.2.1", "bson": "^4.6.1", "canvas": "^2.9.3", diff --git a/src/client/views/nodes/button/FontIconBox.tsx b/src/client/views/nodes/button/FontIconBox.tsx index 8314f2d86..d181de8d0 100644 --- a/src/client/views/nodes/button/FontIconBox.tsx +++ b/src/client/views/nodes/button/FontIconBox.tsx @@ -1,7 +1,7 @@ import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Tooltip } from '@material-ui/core'; -import { ColorPicker, Dropdown, DropdownType, IconButton, IListItemProps, OrientationType, Size, Toggle, ToggleType, Type } from 'browndash-components'; +import { ColorPicker, Dropdown, DropdownType, IconButton, IListItemProps, Size, Toggle, ToggleType, Type } from 'browndash-components'; import { action, computed, observable, runInAction } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; @@ -337,7 +337,7 @@ export class FontIconBox extends DocComponent() { ); return ( - + ) return ( @@ -419,6 +419,8 @@ export class FontIconBox extends DocComponent() { setTimeout(() => Doc.UnBrushAllDocs()); e.stopPropagation(); }} + color={color} + type={Type.PRIM} icon={this.Icon(color)!} tooltip={tooltip} /> @@ -562,7 +564,7 @@ export class FontIconBox extends DocComponent() { // shortcut: '#', } )); - button = + button = break; case ButtonType.ColorButton: button = this.colorButton; break; case ButtonType.NumberDropdownButton: button = this.numberDropdownButton; break; diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx index 80294917f..b613a0e3e 100644 --- a/src/client/views/topbar/TopBar.tsx +++ b/src/client/views/topbar/TopBar.tsx @@ -95,7 +95,7 @@ export class TopBar extends React.Component {