From e761d9b69fa14376fa9c3a9984e1aa669d9f4db4 Mon Sep 17 00:00:00 2001 From: Neha Gokhale Date: Mon, 4 Mar 2024 08:43:10 -0800 Subject: [PATCH 1/4] #1721 Replace codemirror-lang-r package with @codemirror/legacy-modes (#1722) Signed-off-by: Neha Gokhale Co-authored-by: Matt Howard --- canvas_modules/common-canvas/package.json | 4 +-- .../controls/expression/expression.jsx | 8 +++--- .../controls/expression/languages/r-hint.js | 25 ++++++++++++------- .../e2e/properties/expression-control.cy.js | 9 ++++--- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/canvas_modules/common-canvas/package.json b/canvas_modules/common-canvas/package.json index c4ceb58ef7..f68d025268 100644 --- a/canvas_modules/common-canvas/package.json +++ b/canvas_modules/common-canvas/package.json @@ -27,8 +27,8 @@ "@codemirror/lang-javascript": "^6.2.1", "@codemirror/lang-python": "^6.1.4", "@codemirror/lang-sql": "^6.5.5", - "codemirror-lang-r": "^0.1.0-2", "@codemirror/language": "^6.10.1", + "@codemirror/legacy-modes": "^6.3.3", "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.23.1", "@codemirror/autocomplete": "^6.12.0", @@ -119,7 +119,7 @@ }, "jest": { "transformIgnorePatterns": [ - "/node_modules/(?!(lezer-r|d3|d3-array|d3-axis|d3-brush|d3-chord|d3-color|d3-contour|d3-delaunay|d3-dispatch|d3-drag|d3-dsv|d3-ease|d3-fetch|d3-force|d3-format|d3-geo|d3-hierarchy|d3-interpolate|d3-path|d3-polygon|d3-quadtree|d3-random|d3-scale|d3-scale-chromatic|d3-selection|d3-shape|d3-time|d3-time-format|d3-timer|d3-transition|d3-zoom)/)" + "node_modules/(?!(@codemirror/legacy-modes|d3-*))" ], "moduleFileExtensions": [ "js", diff --git a/canvas_modules/common-canvas/src/common-properties/controls/expression/expression.jsx b/canvas_modules/common-canvas/src/common-properties/controls/expression/expression.jsx index ceea94373a..a2db69d2fe 100644 --- a/canvas_modules/common-canvas/src/common-properties/controls/expression/expression.jsx +++ b/canvas_modules/common-canvas/src/common-properties/controls/expression/expression.jsx @@ -41,12 +41,11 @@ import { Compartment } from "@codemirror/state"; import { tags } from "@lezer/highlight"; import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { python } from "@codemirror/lang-python"; -import { r } from "codemirror-lang-r"; import { sql } from "@codemirror/lang-sql"; import { javascript } from "@codemirror/lang-javascript"; import { getPythonHints } from "./languages/python-hint"; -import { getRHints } from "./languages/r-hint"; +import { rLanguage } from "./languages/r-hint"; import { clem } from "./languages/CLEM-hint"; const pxPerChar = 8.5; @@ -168,14 +167,13 @@ class ExpressionControl extends React.Component { this.origHint = getPythonHints(); break; case "text/x-rsrc": - language = r(); - this.origHint = getRHints(); + language = rLanguage(); // custom language break; case "javascript": language = javascript(); break; default: - language = clem(); + language = clem(); // custom language } // Custom completions add to the language completions diff --git a/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js b/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js index 4cc05b7b6e..afe3426ef6 100644 --- a/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js +++ b/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js @@ -14,12 +14,9 @@ * limitations under the License. */ -// Ref: https://cran.r-project.org/doc/manuals/r-release/R-lang.html#Reserved-words -// Search for "10.3.3 Reserved words" -const keywords = "if|else|repeat|while|function|for|in|next|break" + - "|TRUE|FALSE|NULL|Inf|NaN|NA|NA_integer_|NA_real_|NA_complex_|NA_character_"; - -const rKeywords = keywords.split("|"); +import { LanguageSupport, StreamLanguage } from "@codemirror/language"; +import { completeFromList } from "@codemirror/autocomplete"; +import { r } from "@codemirror/legacy-modes/mode/r"; const builtIns = "zapsmall xzfile xtfrm xor writeLines writeChar writeBin write withVisible withRestarts within" + " withCallingHandlers withAutoprint with while which weekdays warnings warning version Vectorize vector vapply" + @@ -70,13 +67,23 @@ const rBuiltIns = builtIns.split(" "); function getRHints() { const rHints = []; - rKeywords.forEach((keyword) => rHints.push({ label: keyword, type: "keyword" })); - rBuiltIns.forEach((builtIn) => rHints.push({ label: builtIn, type: "keyword" })); return rHints; } +// Define R language +const rLan = StreamLanguage.define(r); + +// Autocompletions +const rCompletion = rLan.data.of({ + autocomplete: completeFromList(getRHints()) +}); + +function rLanguage() { + return new LanguageSupport(rLan, [rCompletion]); +} + export { - getRHints + rLanguage }; diff --git a/canvas_modules/harness/cypress/e2e/properties/expression-control.cy.js b/canvas_modules/harness/cypress/e2e/properties/expression-control.cy.js index d5b2ced2c8..5d374e4f15 100644 --- a/canvas_modules/harness/cypress/e2e/properties/expression-control.cy.js +++ b/canvas_modules/harness/cypress/e2e/properties/expression-control.cy.js @@ -168,13 +168,14 @@ describe("Test of Python and R expression controls", function() { // test R autocomplete and syntax highlighting cy.verifyTypeOfWordInExpressionEditor("# syntax testing", "comment", "conditionExpr"); cy.verifyTypeOfWordInExpressionEditor("1", "number", "conditionExpr"); - cy.verifyTypeOfWordInExpressionEditor("text", "string", "conditionExpr"); - cy.verifyTypeOfWordInExpressionEditor("\n", "string", "conditionExpr"); + cy.verifyTypeOfWordInExpressionEditor("text\"", "string", "conditionExpr"); + cy.verifyTypeOfWordInExpressionEditor('\n', "string", "conditionExpr"); cy.verifyTypeOfWordInExpressionEditor("=", "operator", "conditionExpr"); cy.verifyTypeOfWordInExpressionEditor("function", "keyword", "conditionExpr"); - cy.verifyTypeOfWordInExpressionEditor("Inf", "number", "conditionExpr"); - cy.verifyTypeOfWordInExpressionEditor("return", "keyword", "conditionExpr"); + cy.verifyTypeOfWordInExpressionEditor("Inf", "keyword", "conditionExpr"); + cy.verifyTypeOfWordInExpressionEditor("return", "variable", "conditionExpr"); cy.verifyTypeOfWordInExpressionEditor("<-", "operator", "conditionExpr"); + cy.verifyTypeOfWordInExpressionEditor(";", "punctuation", "conditionExpr"); cy.enterTextInExpressionEditor("br", "conditionExpr"); cy.verifyNumberOfHintsInExpressionEditor(9); From 4f73196fb90649ae35e737c8349d791b105e2927 Mon Sep 17 00:00:00 2001 From: srikant Date: Tue, 5 Mar 2024 00:05:01 +0530 Subject: [PATCH 2/4] #1732 Fix Common Properties Checkbox Information Icon alignment for long text. (#1733) Signed-off-by: srikant Co-authored-by: Matt Howard --- .../src/common-properties/controls/checkbox/checkbox.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/canvas_modules/common-canvas/src/common-properties/controls/checkbox/checkbox.scss b/canvas_modules/common-canvas/src/common-properties/controls/checkbox/checkbox.scss index 52c2b0fb0e..d43ffef1d7 100644 --- a/canvas_modules/common-canvas/src/common-properties/controls/checkbox/checkbox.scss +++ b/canvas_modules/common-canvas/src/common-properties/controls/checkbox/checkbox.scss @@ -17,7 +17,6 @@ .properties-checkbox { display: flex; align-items: center; - flex-wrap: wrap; .tooltip-container { margin-left: $spacing-03; cursor: pointer; From 122d730d9c8da3eb20980658abb1023e05fd271f Mon Sep 17 00:00:00 2001 From: CTomlyn Date: Mon, 4 Mar 2024 11:04:00 -0800 Subject: [PATCH 3/4] #1728 Use carbon icons in place of hand-crafted icons (#1729) --- .../assets/images/palette/close_32.svg | 1 - .../assets/images/palette/palette_close.svg | 4 - .../palette/palette_grid_deselected.svg | 2 - .../images/palette/palette_grid_hover.svg | 2 - .../images/palette/palette_grid_selected.svg | 2 - .../palette/palette_list_deselected.svg | 1 - .../images/palette/palette_list_hover.svg | 1 - .../images/palette/palette_list_selected.svg | 1 - .../assets/images/palette/palette_open.svg | 4 - .../assets/images/zoom_to_fit.svg | 8 -- .../palette-dialog-topbar-three-way-icon.jsx | 82 ------------------- .../src/palette/palette-dialog-topbar.jsx | 65 ++++++--------- .../common-canvas/src/palette/palette.scss | 42 +--------- .../common-canvas/src/toolbar/index.js | 18 ++++ .../src/toolbar/toolbar-button-item.jsx | 19 ++--- 15 files changed, 56 insertions(+), 196 deletions(-) delete mode 100644 canvas_modules/common-canvas/assets/images/palette/close_32.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_close.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_grid_deselected.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_grid_hover.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_grid_selected.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_list_deselected.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_list_hover.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_list_selected.svg delete mode 100644 canvas_modules/common-canvas/assets/images/palette/palette_open.svg delete mode 100644 canvas_modules/common-canvas/assets/images/zoom_to_fit.svg delete mode 100644 canvas_modules/common-canvas/src/palette/palette-dialog-topbar-three-way-icon.jsx create mode 100644 canvas_modules/common-canvas/src/toolbar/index.js diff --git a/canvas_modules/common-canvas/assets/images/palette/close_32.svg b/canvas_modules/common-canvas/assets/images/palette/close_32.svg deleted file mode 100644 index af54203949..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/close_32.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_close.svg b/canvas_modules/common-canvas/assets/images/palette/palette_close.svg deleted file mode 100644 index 5bcb777386..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_close.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_grid_deselected.svg b/canvas_modules/common-canvas/assets/images/palette/palette_grid_deselected.svg deleted file mode 100644 index d1215d0f20..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_grid_deselected.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_grid_hover.svg b/canvas_modules/common-canvas/assets/images/palette/palette_grid_hover.svg deleted file mode 100644 index bb3289f53b..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_grid_hover.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_grid_selected.svg b/canvas_modules/common-canvas/assets/images/palette/palette_grid_selected.svg deleted file mode 100644 index d9819af293..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_grid_selected.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_list_deselected.svg b/canvas_modules/common-canvas/assets/images/palette/palette_list_deselected.svg deleted file mode 100644 index c250d56c45..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_list_deselected.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_list_hover.svg b/canvas_modules/common-canvas/assets/images/palette/palette_list_hover.svg deleted file mode 100644 index 2f6d3514aa..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_list_hover.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_list_selected.svg b/canvas_modules/common-canvas/assets/images/palette/palette_list_selected.svg deleted file mode 100644 index b1951fe1b3..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_list_selected.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/canvas_modules/common-canvas/assets/images/palette/palette_open.svg b/canvas_modules/common-canvas/assets/images/palette/palette_open.svg deleted file mode 100644 index c014520ad3..0000000000 --- a/canvas_modules/common-canvas/assets/images/palette/palette_open.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/canvas_modules/common-canvas/assets/images/zoom_to_fit.svg b/canvas_modules/common-canvas/assets/images/zoom_to_fit.svg deleted file mode 100644 index 4cb7e256f9..0000000000 --- a/canvas_modules/common-canvas/assets/images/zoom_to_fit.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/canvas_modules/common-canvas/src/palette/palette-dialog-topbar-three-way-icon.jsx b/canvas_modules/common-canvas/src/palette/palette-dialog-topbar-three-way-icon.jsx deleted file mode 100644 index 4bfb5c84d2..0000000000 --- a/canvas_modules/common-canvas/src/palette/palette-dialog-topbar-three-way-icon.jsx +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2017-2023 Elyra Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import React from "react"; -import PropTypes from "prop-types"; - -class PaletteDialogTopbarThreeWayIcon extends React.Component { - constructor(props) { - super(props); - - this.state = { - hover: false - }; - - this.iconClicked = this.iconClicked.bind(this); - this.mouseEnter = this.mouseEnter.bind(this); - this.mouseLeave = this.mouseLeave.bind(this); - this.mouseDown = this.mouseDown.bind(this); - } - - iconClicked() { - this.props.iconClickedMethod(); - } - - mouseEnter() { - this.setState({ hover: true }); - } - - mouseLeave() { - this.setState({ hover: false }); - } - - mouseDown(mouseDownEvent) { - mouseDownEvent.stopPropagation(); - } - - render() { - let icon = this.props.selectedIconName; - - if (!this.props.isSelected) { - if (this.state.hover) { - icon = this.props.hoverIconName; - } else { - icon = this.props.deselectedIconName; - } - } - - return ( -
- -
- ); - } -} - -PaletteDialogTopbarThreeWayIcon.propTypes = { - iconClickedMethod: PropTypes.func.isRequired, - isSelected: PropTypes.bool.isRequired, - selectedIconName: PropTypes.string.isRequired, - hoverIconName: PropTypes.string.isRequired, - deselectedIconName: PropTypes.string.isRequired -}; - -export default PaletteDialogTopbarThreeWayIcon; diff --git a/canvas_modules/common-canvas/src/palette/palette-dialog-topbar.jsx b/canvas_modules/common-canvas/src/palette/palette-dialog-topbar.jsx index c48e3ee17a..8597829724 100644 --- a/canvas_modules/common-canvas/src/palette/palette-dialog-topbar.jsx +++ b/canvas_modules/common-canvas/src/palette/palette-dialog-topbar.jsx @@ -16,14 +16,10 @@ import React from "react"; import PropTypes from "prop-types"; -import PaletteDialogTopbarThreeWayIcon from "./palette-dialog-topbar-three-way-icon.jsx"; -import Close32Icon from "../../assets/images/palette/close_32.svg"; -import PaletteGridSelectedIcon from "../../assets/images/palette/palette_grid_selected.svg"; -import PaletteGridHoverIcon from "../../assets/images/palette/palette_grid_hover.svg"; -import PaletteGridDeSelectedIcon from "../../assets/images/palette/palette_grid_deselected.svg"; -import PaletteListSelectedIcon from "../../assets/images/palette/palette_list_selected.svg"; -import PaletteListHoverIcon from "../../assets/images/palette/palette_list_hover.svg"; -import PaletteListDeSelectedIcon from "../../assets/images/palette/palette_list_deselected.svg"; + +import { CloseOutline16, Grid16, List16 } from "@carbon/icons-react"; + +import Toolbar from "../toolbar"; class PaletteDialogTopbar extends React.Component { constructor(props) { @@ -34,9 +30,7 @@ class PaletteDialogTopbar extends React.Component { this.mouseDown = this.mouseDown.bind(this); this.doubleClick = this.doubleClick.bind(this); - this.close = this.close.bind(this); - this.gridViewSelected = this.gridViewSelected.bind(this); - this.listViewSelected = this.listViewSelected.bind(this); + this.toolbarActionHandler = this.toolbarActionHandler.bind(this); } mouseDown(mouseDownEvent) { @@ -47,40 +41,35 @@ class PaletteDialogTopbar extends React.Component { this.props.windowMaximizeMethod(doubleClickEvent); } - close(closeEvent) { - this.props.canvasController.closePalette(closeEvent); - } + toolbarActionHandler(action) { + if (action === "close") { + this.props.canvasController.closePalette(); - gridViewSelected() { - this.props.showGridMethod(true); - } + } else if (action === "grid") { + this.props.showGridMethod(true); - listViewSelected() { - this.props.showGridMethod(false); + } else if (action === "list") { + this.props.showGridMethod(false); + } } render() { + const config = { + leftBar: [ + { action: "grid", iconEnabled: (), enable: true, isSelected: this.props.showGrid }, + { action: "list", iconEnabled: (), enable: true, isSelected: !this.props.showGrid }, + { divider: true } + ], + rightBar: [ + { divider: true }, + { action: "close", iconEnabled: (), enable: true } + ] + }; + + return (
- - - - - - - - - +
); } diff --git a/canvas_modules/common-canvas/src/palette/palette.scss b/canvas_modules/common-canvas/src/palette/palette.scss index 1b55aecaf5..4fd5056ab4 100644 --- a/canvas_modules/common-canvas/src/palette/palette.scss +++ b/canvas_modules/common-canvas/src/palette/palette.scss @@ -420,47 +420,9 @@ $palette-search-container-height: 41px; } .palette-dialog-topbar { - height: 40px; - padding: 10px; + height: 41px; background-color: $ui-03; border-bottom: $palette-border-width solid $palette-border-color; - - .left-navbar { - height: 20px; - float: left; - vertical-align: middle; - /* Prevent elements from being selectable */ - /* This stops it being dragged incorrectly.*/ - user-select: none; - } - - .right-navbar { - height: 20px; - float: right; - vertical-align: middle; - } - - .secondary-action { - margin-left: 10px; - display: inline-block; - cursor: pointer; - width: 20px; - } - - .close-icon svg { - fill: $interactive-02; - } - - .palette-three-way-icon-div { - margin-left: 5px; - display: inline-block; - cursor: pointer; - width: 20px; - height: 20px; - /* Prevent elements from being selectable */ - /* This stops it being dragged incorrectly.*/ - user-select: none; - } } .palette-dialog-content { @@ -472,7 +434,7 @@ $palette-search-container-height: 41px; } .palette-dialog-categories { - background-color: $ui-03; + background-color: $ui-01; width: 130px; min-width: 130px; /* Set a min-width to ensure space for the scroll bar when it is displayed */ border-right: $palette-border-width solid $palette-border-color; diff --git a/canvas_modules/common-canvas/src/toolbar/index.js b/canvas_modules/common-canvas/src/toolbar/index.js new file mode 100644 index 0000000000..69b6d9c5f7 --- /dev/null +++ b/canvas_modules/common-canvas/src/toolbar/index.js @@ -0,0 +1,18 @@ +/* + * Copyright 2024 Elyra Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import Toolbar from "./toolbar.jsx"; +export default Toolbar; diff --git a/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx b/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx index 951b9bbc9b..f297f8a0ee 100644 --- a/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx +++ b/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx @@ -21,9 +21,6 @@ import Tooltip from "../tooltip/tooltip.jsx"; import ArrangeHorizontally from "./../../assets/images/arrange_horizontally.svg"; import ArrangeVertically from "./../../assets/images/arrange_vertically.svg"; import ToggleNotificationPanel from "./../../assets/images/notification_counter_icon.svg"; -import PaletteClose from "./../../assets/images/palette/palette_close.svg"; -import PaletteOpen from "./../../assets/images/palette/palette_open.svg"; -import ZoomToFit from "./../../assets/images/zoom_to_fit.svg"; import { Button } from "carbon-components-react"; import SVG from "react-inlinesvg"; @@ -31,7 +28,8 @@ import classNames from "classnames"; import { StopFilledAlt16, Play16, Undo16, Redo16, Chat16, ChatOff16, Result16, Cut16, Copy16, Paste16, Edit16, ColorPalette16, Maximize16, Minimize16, Launch16, AddComment16, TrashCan16, ZoomIn16, ZoomOut16, - ChevronRight16, ChevronDown16, ChevronUp16 } from "@carbon/icons-react"; + ChevronRight16, ChevronDown16, ChevronUp16, + CenterToFit16, OpenPanelFilledLeft16 } from "@carbon/icons-react"; import { TOOLBAR_STOP, TOOLBAR_RUN, TOOLBAR_UNDO, TOOLBAR_REDO, TOOLBAR_CUT, TOOLBAR_COPY, TOOLBAR_PASTE, TOOLBAR_CLIPBOARD, TOOLBAR_CREATE_COMMENT, TOOLBAR_CREATE_AUTO_COMMENT, TOOLBAR_COLOR_BACKGROUND, @@ -113,17 +111,18 @@ class ToolbarButtonItem extends React.Component { return ; case (TOOLBAR_ZOOM_OUT): return ; - case (TOOLBAR_ZOOM_FIT): - return ; + return ; + case (TOOLBAR_OPEN_PALETTE): + return ; + case (TOOLBAR_CLOSE_PALETTE): + return ; + + // Non-carbon icons case (TOOLBAR_ARRANGE_HORIZONALLY): return ; case (TOOLBAR_ARRANGE_VERTICALLY): return ; - case (TOOLBAR_OPEN_PALETTE): - return ; - case (TOOLBAR_CLOSE_PALETTE): - return ; case (TOOLBAR_TOGGLE_NOTIFICATION_PANEL): return ; From e14dce5c83f015a5d6aee1d16cbfd06ce119cea3 Mon Sep 17 00:00:00 2001 From: CTomlyn Date: Mon, 4 Mar 2024 11:38:47 -0800 Subject: [PATCH 4/4] #1725 Toolbar icon selected highlighting not thick enough (#1726) --- canvas_modules/common-canvas/src/toolbar/toolbar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canvas_modules/common-canvas/src/toolbar/toolbar.scss b/canvas_modules/common-canvas/src/toolbar/toolbar.scss index dbd13bc6a4..8775690aa2 100644 --- a/canvas_modules/common-canvas/src/toolbar/toolbar.scss +++ b/canvas_modules/common-canvas/src/toolbar/toolbar.scss @@ -106,6 +106,7 @@ $toolbar-divider-width: 1px; & button { padding: 0; min-height: 30px; + height: $toolbar-button-height; } &.default, @@ -210,7 +211,6 @@ $toolbar-divider-width: 1px; } .toolbar-icon { - height: $toolbar-icon-size; & svg { height: $toolbar-icon-size; width: $toolbar-icon-size;