Skip to content

Commit 59f4596

Browse files
authored
Merge branch 'develop' into feature/markdownCutOff-CMEM-7659
2 parents 4e96644 + 6ac22fa commit 59f4596

14 files changed

Lines changed: 115 additions & 61 deletions

File tree

.github/workflows/push-tagged-release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
- uses: actions/setup-node@main
3838
with:
3939
node-version: "lts/krypton"
40-
registry-url: "https://registry.npmjs.org"
4140
- name: Set name vars
4241
id: info-vars
4342
run: |
@@ -68,6 +67,11 @@ jobs:
6867
token: ${{ secrets.GITHUB_TOKEN }}
6968
projectToken: ${{ secrets.chromaticToken }}
7069
exitZeroOnChanges: true
70+
- uses: actions/setup-node@main
71+
with:
72+
node-version: "lts/krypton"
73+
registry-url: "https://registry.npmjs.org"
74+
package-manager-cache: false
7175
- name: Publish npm package
7276
run: yarn publish --access public
7377
env:

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
3333
- **React and its types were updated to v18, so you may hit incompatibilities if you run it with React 16 or 17.**
3434
- `color` library was upgraded from v4 to v5, so the types changed
3535
- if you forward properties then they cannot have `Color` as type, use `ColorLike`
36+
- `@blueprintjs/core` library was updated to v6
37+
- you may need to update class names in your tests (the new prefix is `bp6-`)
38+
- `Toaster.create` is now an async function
3639
- `<MultiSelect />`
3740
- by default, if no searchPredicate or searchListPredicate is defined, the filtering is done via case-insensitive multi-word filtering.
3841
- `<StringPreviewContentBlobToggler />` uses now the `Markdown.cutOff` property

blueprint/toaster/index.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
export { Toaster as default } from "@blueprintjs/core";
1+
import { OverlayToaster } from "@blueprintjs/core";
2+
3+
/**
4+
* `OverlayToaster` from BlueprintJS, we still serve it as `Toaster`.
5+
* @deprecated (v27) will be completely removed.
6+
*/
7+
const Toaster = OverlayToaster;
8+
export { Toaster };
9+
export default Toaster;

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
"autolint:all": "yarn autolint:scripts && yarn autolint:styles && yarn autolint:prettier"
6969
},
7070
"dependencies": {
71-
"@blueprintjs/colors": "^5.1.11",
72-
"@blueprintjs/core": "^5.19.1",
73-
"@blueprintjs/select": "^5.3.21",
71+
"@blueprintjs/colors": "^5.1.16",
72+
"@blueprintjs/core": "6.8.1",
73+
"@blueprintjs/select": "6.1.1",
7474
"@carbon/icons": "^11.80.0",
7575
"@carbon/react": "^1.107.1",
7676
"@codemirror/lang-html": "^6.4.11",
@@ -175,10 +175,11 @@
175175
"yargs": "^18.0.0"
176176
},
177177
"peerDependencies": {
178-
"@blueprintjs/core": ">=5",
178+
"@blueprintjs/core": ">=6",
179179
"react": ">=18"
180180
},
181181
"resolutions": {
182+
"**/@blueprintjs/core": "6.8.1",
182183
"node-sass-package-importer/**/postcss": "^8.5.10",
183184
"hast-util-from-parse5": "8.0.0",
184185
"**/lodash": "^4.18.1",

src/common/scss/_color-functions.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@
9292
}
9393

9494
@if $alpha > 0 {
95-
@return eccgui-color-mix($color 100% * $alpha, transparent);
95+
@if math.is-unitless($alpha) {
96+
$alpha: 100% * $alpha;
97+
}
98+
99+
@return eccgui-color-mix($color $alpha, transparent);
96100
} @else {
97101
// workaround: we need to prevent `0%` because it will reduced to `0` by some CSS minifiers and leads to invalid color-mix values
98102
@return eccgui-color-mix($color, transparent 100%);
@@ -102,6 +106,8 @@
102106
$debug-rgba-values: "yes";
103107

104108
/**
109+
* Overwrite SCSS built-in rgba function
110+
* TODO: we need to check if this is future proof, maybe this behaviour is not planned by Dart Sass library.
105111
* Split between rgba(red, green, blue, alpha) and rgba(color, alpha).
106112
*/
107113
@function rgba($r, $g, $b: "undefined", $a: 1) {
@@ -113,15 +119,14 @@ $debug-rgba-values: "yes";
113119
} @else {
114120
// rgba(r, g, b, a) is used -> rgb(r g b / a)
115121
// @see https://developer.mozilla.org/de/docs/Web/CSS/color_value/rgb
116-
$color-new-notation: rgb(#{$r} #{$g} #{$b} / #{$a});
122+
$color-new-notation: #{"rgb(" + $r + " " + $g + " " + $b + " / " + $a + ")"};
117123

118124
@return $color-new-notation;
119125
}
120126
}
121127

122128
/**
123-
* Overwrite SCSS built-in rgba function to support colors by custom properties and CSS color methods.
124-
* TODO: we need to check if this is future proof, maybe this bahaviour is not planned by Dart Sass library.
129+
* Support colors by custom properties and CSS color methods.
125130
*/
126131
@function rgba-extended($color, $alpha) {
127132
@if meta.type-of($color) == "color" {

src/components/Application/stories/ColorPalettes.stories.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react";
22
import { createRoot } from "react-dom/client";
33
import { loremIpsum } from "react-lorem-ipsum";
4+
import { Classes as BlueprintClasses } from "@blueprintjs/core";
45
import { Meta, StoryFn } from "@storybook/react";
56
import Color from "color";
67

@@ -183,7 +184,9 @@ const ColorPaletteConfigurator = ({
183184

184185
React.useEffect(() => {
185186
if (refConfigurator.current) {
186-
const panelConfig = document.getElementById("bp5-tab-panel_colorconfig_editor");
187+
const panelConfig = document.getElementById(
188+
`${BlueprintClasses.getClassNamespace()}-tab-panel_colorconfig_editor`,
189+
);
187190
if (panelConfig) {
188191
const warnings = Array.from(panelConfig.getElementsByClassName("eccgui-badge"))
189192
.map((warning: Element) => {

src/components/Button/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $button-border-radius: $pt-border-radius;
99

1010
// $button-padding-small: 0 ($pt-grid-size * 0.7) !default;
1111
// $button-padding-large: ($pt-grid-size * 0.5) ($pt-grid-size * 1.5) !default;
12-
// $button-icon-spacing: ($pt-button-height - $pt-icon-size-standard) * 0.5 !default;
12+
$button-icon-spacing: $pt-grid-size * 0.5; // ($pt-button-height - $pt-icon-size-standard) * 0.5 !default;
1313
// $button-icon-spacing-large: ($pt-button-height-large - $pt-icon-size-large) * 0.5 !default;
1414
// $button-box-shadow: inset 0 0 0 $button-border-width rgba($black, 0.2), inset 0 (-$button-border-width) 0 rgba($black, 0.1) !default;
1515
// $button-box-shadow-active: inset 0 0 0 $button-border-width rgba($black, 0.2), inset 0 1px 2px rgba($black, 0.2) !default;

src/components/Chat/_chat.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.#{$eccgui}-chat__content {
2-
@extend .bp5-elevation-1;
2+
@extend .#{$ns}-elevation-1;
33

44
position: relative;
55
z-index: 0;
@@ -32,7 +32,7 @@
3232
position: relative;
3333

3434
&::before {
35-
@extend .bp5-elevation-1;
35+
@extend .#{$ns}-elevation-1;
3636

3737
position: absolute;
3838
top: calc(#{mini-units(3)} - #{0.5 * $eccgui-size-block-whitespace});

src/components/Icon/icon.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ svg.#{$eccgui}-icon {
3232
}
3333

3434
.#{$ns}-button .#{$eccgui}-icon:first-child {
35-
margin-left: -($pt-button-height - $pt-icon-size-standard) * 0.5;
35+
margin-left: -($button-icon-spacing);
3636
}
3737
.#{$ns}-button .#{$eccgui}-icon:last-child {
38-
margin-right: -($pt-button-height - $pt-icon-size-standard) * 0.5;
38+
margin-right: -($button-icon-spacing);
3939
}
4040

4141
.#{$ns}-button .#{$eccgui}-icon:first-child:last-child,
4242
.#{$ns}-button .#{$ns}-spinner + .#{$eccgui}-icon:last-child {
43-
margin: 0 (-($pt-button-height - $pt-icon-size-standard) * 0.5);
43+
margin: 0 (-($button-icon-spacing));
4444
}
4545

4646
.#{$eccgui}-button--icon {
@@ -49,7 +49,7 @@ svg.#{$eccgui}-icon {
4949
}
5050

5151
& > .#{$ns}-button-text {
52-
margin-left: -5px;
52+
margin-left: -($pt-grid-size) * 0.5;
5353
}
5454

5555
& > .#{$eccgui}-tooltip__wrapper + .#{$ns}-button-text {

src/components/Menu/menu.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ $menu-background-color: transparent !default;
3636
}
3737

3838
.#{$ns}-menu-header {
39+
padding-left: unset;
3940
margin-right: unset;
4041
margin-left: unset;
4142
}

0 commit comments

Comments
 (0)