Skip to content

Commit

Permalink
#2270 Canvas palette not loading/displayed in Safari browser (#2278)
Browse files Browse the repository at this point in the history
Signed-off-by: CTomlyn <[email protected]>
  • Loading branch information
tomlyn authored Dec 17, 2024
1 parent 497aa4b commit 79db419
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,11 @@ class PaletteFlyoutContent extends React.Component {
? this.props.paletteHeader
: null;

let className = "palette-flyout-content";
className += paletteHeader ? " with-palette-header" : "";

return (
<div className="palette-flyout-content">
<div className={className}>
{contentSearch}
{paletteHeader}
{contentCategories}
Expand Down
8 changes: 7 additions & 1 deletion canvas_modules/common-canvas/src/palette/palette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,17 @@ $palette-dialog-list-item-height: 46px;
height: 100%;
}

// Overrides the grid-template-rows for when a palette header object is
// included. (This fixes a problem specifically on Safari.)
.palette-flyout-content.with-palette-header {
grid-template-rows: $palette-search-container-height auto 1fr;
}

.palette-flyout-content {
position: absolute; // Needed to allow the scroll of categories/nodes to work.
height: 100%;
display: grid;
grid-template-rows: $palette-search-container-height auto 1fr;
grid-template-rows: $palette-search-container-height 1fr;
// grid-template-columns is set based on narrow or open palette

.palette-scroll {
Expand Down

0 comments on commit 79db419

Please sign in to comment.