Skip to content

Commit 79db419

Browse files
authored
#2270 Canvas palette not loading/displayed in Safari browser (#2278)
Signed-off-by: CTomlyn <[email protected]>
1 parent 497aa4b commit 79db419

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

canvas_modules/common-canvas/src/palette/palette-flyout-content.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,11 @@ class PaletteFlyoutContent extends React.Component {
145145
? this.props.paletteHeader
146146
: null;
147147

148+
let className = "palette-flyout-content";
149+
className += paletteHeader ? " with-palette-header" : "";
150+
148151
return (
149-
<div className="palette-flyout-content">
152+
<div className={className}>
150153
{contentSearch}
151154
{paletteHeader}
152155
{contentCategories}

canvas_modules/common-canvas/src/palette/palette.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,17 @@ $palette-dialog-list-item-height: 46px;
5757
height: 100%;
5858
}
5959

60+
// Overrides the grid-template-rows for when a palette header object is
61+
// included. (This fixes a problem specifically on Safari.)
62+
.palette-flyout-content.with-palette-header {
63+
grid-template-rows: $palette-search-container-height auto 1fr;
64+
}
65+
6066
.palette-flyout-content {
6167
position: absolute; // Needed to allow the scroll of categories/nodes to work.
6268
height: 100%;
6369
display: grid;
64-
grid-template-rows: $palette-search-container-height auto 1fr;
70+
grid-template-rows: $palette-search-container-height 1fr;
6571
// grid-template-columns is set based on narrow or open palette
6672

6773
.palette-scroll {

0 commit comments

Comments
 (0)