Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 4c383e9

Browse files
ElRaptorusElRaptorus
authored
Bump to 15.2.4 (#6)
# Changes Siehe Changelog: https://github.com/bpmn-io/diagram-js/blob/develop/CHANGELOG.md ## 15.2.4 * `FIX`: canvas `autoFocus` must explicitly be enabled ([bpmn-io#956](bpmn-io#956)) * `FIX`: properly integrate `zoomscroll` with canvas focus ([bpmn-io#956](bpmn-io#956)) * `FIX`: properly integrate `movecanvas` with canvas focus ([bpmn-io#956](bpmn-io#956)) ## 15.2.3 * `FIX`: adjust search to prioritize start of word and exact matches ([bpmn-io#953](bpmn-io#953)) * `FIX`: ignore whitespace when searching ([bpmn-io#954](bpmn-io#954)) ## 15.2.2 * `FIX`: correct `Keyboard#bind` and config types ([bpmn-io#948](bpmn-io#948)) ## 15.2.1 * `FIX`: limit overly permissive regex ([bpmn-io#949](bpmn-io#949)) ## 15.2.0 * `FIX`: clear selection when opening search pad ([bpmn-io#947](bpmn-io#947)) * `FIX`: correct dangling selection after search pad interaction ([bpmn-io#947](bpmn-io#947)) * `CHORE`: simplify search pad pre-selection behavior ([bpmn-io#947](bpmn-io#947)) ## 15.1.0 * `FEAT`: integrate `popup-menu` with `search` ([bpmn-io#932](bpmn-io#932)) * `FEAT`: recognize modern `search` tokens in `search-pad` ([bpmn-io#932](bpmn-io#932)) * `FEAT`: improve `search` types ([bpmn-io#932](bpmn-io#932)) * `FIX`: correctly handle duplicate entries and whitespace in `search` ([bpmn-io#932](bpmn-io#932)) * `FIX`: find `search` terms across all keys ([bpmn-io#932](bpmn-io#932)) * `FIX`: `search` always returns tokens for matched items ([bpmn-io#932](bpmn-io#932)) ## 15.0.0 * `FEAT`: make canvas browser selectable ([bpmn-io#659](bpmn-io#659)) * `FEAT`: make keyboard binding implicit ([bpmn-io#661](bpmn-io#661)) * `FEAT`: make multi-selection outline an outline concern ([bpmn-io#944](bpmn-io#944)) ### Breaking Changes * `Keyboard` binding target can no longer be chosen. Configure keyboard binding via the `keyboard.bind` configuration and rely on keybindings to work if the canvas has browser focus. ([bpmn-io#661](bpmn-io#661)) * The `Canvas` is now a focusable component, that is recognized accordingly by the browser, with all benefits for UX and interaction. Components that pull focus from the `Canvas` during modeling must ensure to restore the focus (if intended), via `Canvas#restoreFocus`. ([bpmn-io#661](bpmn-io#661)) * The `selection` feature does not provide visual outline by default anymore. Use the `outline` feature to re-enable it. ([bpmn-io#944](bpmn-io#944)) ## 14.11.3 * `CHORE`: simplify viewbox cloning ([bpmn-io#935](bpmn-io#935)) ## 14.11.2 * `FIX`: restore search result highlight ([bpmn-io#931](bpmn-io#931)) * `FIX`: correct search result highlight not being removed ([bpmn-io#931](bpmn-io#931)) * `FIX`: do not change zoom when search openes ([bpmn-io#931](bpmn-io#931)) ## 14.11.1 _Partially reverts v14.11.0._ * `FIX`: revert `search` integration into popup menu ## 14.11.0 * `FEAT`: add `search` utility * `FEAT`: sort popup entry search results semantically ([bpmn-io#916](bpmn-io#916)) ## 14.10.0 * `FEAT`: align search styling with other popups ([bpmn-io#913](bpmn-io#913)) * `CHORE`: use existing outline in search ([bpmn-io#913](bpmn-io#913)) * `FIX`: only commit search viewport changes on `ENTER` ([bpmn-io#913](bpmn-io#913)) ## 14.9.0 * `CHORE`: export types compatible with `verbatimModuleSyntax` ([bpmn-io#927](bpmn-io#927), [bpmn-io#864](bpmn-io#864)) * `CHORE`: re-compute context pad position next frame ([bpmn-io#920](bpmn-io#920))
2 parents 386aa4e + 3df2a4c commit 4c383e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4415
-9116
lines changed

‎.eslintignore

-2
This file was deleted.

‎.eslintrc

-9
This file was deleted.

‎.github/workflows/CODE_SCANNING.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '**/*.md'
1010

1111
jobs:
12-
CodeQL-Build:
12+
codeql_build:
1313
# CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
1414
runs-on: ubuntu-latest
1515

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
node_modules/
22
dist/
3+
tmp/
34
coverage/
45
lib/**/*.d.ts
56
.idea/

‎CHANGELOG.md

+79-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,84 @@ All notable changes to [diagram-js](https://github.com/bpmn-io/diagram-js) are d
66

77
_**Note:** Yet to be released changes appear here._
88

9+
## 15.2.4
10+
11+
* `FIX`: canvas `autoFocus` must explicitly be enabled ([#956](https://github.com/bpmn-io/diagram-js/pull/956))
12+
* `FIX`: properly integrate `zoomscroll` with canvas focus ([#956](https://github.com/bpmn-io/diagram-js/pull/956))
13+
* `FIX`: properly integrate `movecanvas` with canvas focus ([#956](https://github.com/bpmn-io/diagram-js/pull/956))
14+
15+
## 15.2.3
16+
17+
* `FIX`: adjust search to prioritize start of word and exact matches ([#953](https://github.com/bpmn-io/diagram-js/pull/953))
18+
* `FIX`: ignore whitespace when searching ([#954](https://github.com/bpmn-io/diagram-js/pull/954))
19+
20+
## 15.2.2
21+
22+
* `FIX`: correct `Keyboard#bind` and config types ([#948](https://github.com/bpmn-io/diagram-js/pull/948))
23+
24+
## 15.2.1
25+
26+
* `FIX`: limit overly permissive regex ([#949](https://github.com/bpmn-io/diagram-js/pull/949))
27+
28+
## 15.2.0
29+
30+
* `FIX`: clear selection when opening search pad ([#947](https://github.com/bpmn-io/diagram-js/pull/947))
31+
* `FIX`: correct dangling selection after search pad interaction ([#947](https://github.com/bpmn-io/diagram-js/pull/947))
32+
* `CHORE`: simplify search pad pre-selection behavior ([#947](https://github.com/bpmn-io/diagram-js/pull/947))
33+
34+
## 15.1.0
35+
36+
* `FEAT`: integrate `popup-menu` with `search` ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
37+
* `FEAT`: recognize modern `search` tokens in `search-pad` ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
38+
* `FEAT`: improve `search` types ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
39+
* `FIX`: correctly handle duplicate entries and whitespace in `search` ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
40+
* `FIX`: find `search` terms across all keys ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
41+
* `FIX`: `search` always returns tokens for matched items ([#932](https://github.com/bpmn-io/diagram-js/pull/932))
42+
43+
## 15.0.0
44+
45+
* `FEAT`: make canvas browser selectable ([#659](https://github.com/bpmn-io/diagram-js/pull/659))
46+
* `FEAT`: make keyboard binding implicit ([#661](https://github.com/bpmn-io/diagram-js/issues/661))
47+
* `FEAT`: make multi-selection outline an outline concern ([#944](https://github.com/bpmn-io/diagram-js/issues/944))
48+
49+
### Breaking Changes
50+
51+
* `Keyboard` binding target can no longer be chosen. Configure keyboard binding via the `keyboard.bind` configuration and rely on keybindings to work if the canvas has browser focus. ([#661](https://github.com/bpmn-io/diagram-js/issues/661))
52+
* The `Canvas` is now a focusable component, that is recognized accordingly by the browser, with all benefits for UX and interaction. Components that pull focus from the `Canvas` during modeling must ensure to restore the focus (if intended), via `Canvas#restoreFocus`. ([#661](https://github.com/bpmn-io/diagram-js/issues/661))
53+
* The `selection` feature does not provide visual outline by default anymore. Use the `outline` feature to re-enable it. ([#944](https://github.com/bpmn-io/diagram-js/issues/944))
54+
55+
## 14.11.3
56+
57+
* `CHORE`: simplify viewbox cloning ([#935](https://github.com/bpmn-io/diagram-js/pull/935))
58+
59+
## 14.11.2
60+
61+
* `FIX`: restore search result highlight ([#931](https://github.com/bpmn-io/diagram-js/pull/931))
62+
* `FIX`: correct search result highlight not being removed ([#931](https://github.com/bpmn-io/diagram-js/pull/931))
63+
* `FIX`: do not change zoom when search openes ([#931](https://github.com/bpmn-io/diagram-js/pull/931))
64+
65+
## 14.11.1
66+
67+
_Partially reverts v14.11.0._
68+
69+
* `FIX`: revert `search` integration into popup menu
70+
71+
## 14.11.0
72+
73+
* `FEAT`: add `search` utility
74+
* `FEAT`: sort popup entry search results semantically ([#916](https://github.com/bpmn-io/diagram-js/pull/916))
75+
76+
## 14.10.0
77+
78+
* `FEAT`: align search styling with other popups ([#913](https://github.com/bpmn-io/diagram-js/pull/913))
79+
* `CHORE`: use existing outline in search ([#913](https://github.com/bpmn-io/diagram-js/pull/913))
80+
* `FIX`: only commit search viewport changes on `ENTER` ([#913](https://github.com/bpmn-io/diagram-js/pull/913))
81+
82+
## 14.9.0
83+
84+
* `CHORE`: export types compatible with `verbatimModuleSyntax` ([#927](https://github.com/bpmn-io/diagram-js/pull/927), [#864](https://github.com/bpmn-io/diagram-js/issues/864))
85+
* `CHORE`: re-compute context pad position next frame ([#920](https://github.com/bpmn-io/diagram-js/pull/920))
86+
987
## 14.8.0
1088

1189
* `FEAT`: add `scheduler` service ([#915](https://github.com/bpmn-io/diagram-js/pull/915))
@@ -137,7 +215,7 @@ _**Note:** Yet to be released changes appear here._
137215
## 12.8.1
138216

139217
* `FIX`: reposition popup menu if it opens above the viewport ([#829](https://github.com/bpmn-io/diagram-js/pull/829))
140-
218+
141219
## 12.8.0
142220

143221
* `FEAT`: remove selection outline from connections ([#826](https://github.com/bpmn-io/diagram-js/pull/826))

‎assets/diagram-js.css

+66-52
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@
7474
--resizer-fill-color: var(--color-blue-205-100-45);
7575
--resizer-stroke-color: var(--canvas-fill-color);
7676

77-
--search-container-background-color: var(--color-grey-225-10-97);
78-
--search-container-border-color: var(--color-blue-205-100-50);
79-
--search-container-box-shadow-color: var(--color-blue-205-100-95);
80-
--search-container-box-shadow-inset-color: var(--color-grey-225-10-80);
77+
--search-font-family: "IBM Plex Sans", sans-serif;
78+
--search-font-size: 14px;
79+
--search-container-background-color: var(--color-white);
80+
--search-shadow-color: var(--color-black-opacity-30);
8181
--search-input-border-color: var(--color-grey-225-10-75);
82-
--search-result-border-color: var(--color-grey-225-10-75);
83-
--search-result-highlight-color: var(--color-black);
84-
--search-result-selected-color: var(--color-blue-205-100-45-opacity-30);
82+
--search-input-focus-border-color: var(--color-blue-205-100-50);
83+
--search-input-focus-background-color: var(--color-blue-205-100-95);
84+
--search-result-hover-background-color: var(--color-grey-225-10-95);
85+
--search-result-secondary-color: var(--color-grey-225-10-55);
86+
--search-preselected-background-color: var(--color-blue-205-100-50-opacity-15);
8587

8688
--shape-attach-allowed-stroke-color: var(--color-blue-205-100-50);
8789
--shape-connect-allowed-fill-color: var(--color-grey-225-10-97);
@@ -98,6 +100,18 @@
98100
--tooltip-error-color: var(--color-red-360-100-45);
99101
}
100102

103+
/**
104+
* SVG styles
105+
*/
106+
107+
.djs-container svg.drop-not-ok {
108+
background: var(--shape-drop-not-allowed-fill-color) !important;
109+
}
110+
111+
.djs-container svg.new-parent {
112+
background: var(--shape-drop-allowed-fill-color) !important;
113+
}
114+
101115
/**
102116
* outline styles
103117
*/
@@ -140,14 +154,6 @@
140154
fill: var(--shape-drop-allowed-fill-color) !important;
141155
}
142156

143-
svg.drop-not-ok {
144-
background: var(--shape-drop-not-allowed-fill-color) !important;
145-
}
146-
147-
svg.new-parent {
148-
background: var(--shape-drop-allowed-fill-color) !important;
149-
}
150-
151157

152158
/* Override move cursor during drop and connect */
153159
.drop-not-ok,
@@ -527,7 +533,7 @@ svg.new-parent {
527533
width: 100%;
528534
box-sizing: border-box;
529535
font-size: var(--popup-font-size);
530-
padding: 3px 6px;
536+
padding: 3px 6px 3px 28px;
531537
border-radius: 2px;
532538
border: solid 1px var(--popup-search-border-color);
533539
line-height: 21px;
@@ -588,6 +594,8 @@ svg.new-parent {
588594
}
589595

590596
.djs-popup-search {
597+
position: relative;
598+
width: auto;
591599
margin: 10px 12px;
592600
}
593601

@@ -598,21 +606,12 @@ svg.new-parent {
598606
margin: 0;
599607
}
600608

601-
.djs-popup-search {
602-
position: relative;
603-
width: auto;
604-
}
605-
606609
.djs-popup-search-icon {
607610
position: absolute;
608611
left: 8px;
609612
top: 7px;
610613
}
611614

612-
.djs-popup-search input {
613-
padding-left: 25px;
614-
}
615-
616615
.djs-popup-results {
617616
margin: 7px 3px 7px 12px;
618617
list-style: none;
@@ -884,6 +883,14 @@ svg.new-parent {
884883
/**
885884
* search pad
886885
*/
886+
.djs-search-open .djs-context-pad {
887+
display: none;
888+
}
889+
890+
.djs-search-open .djs-connection.selected .djs-outline {
891+
display: block;
892+
}
893+
887894
.djs-search-container {
888895
position: absolute;
889896
top: 20px;
@@ -897,76 +904,83 @@ svg.new-parent {
897904
max-width: 400px;
898905
z-index: 10;
899906

900-
font-size: 1.05em;
901-
opacity: 0.9;
902-
background: var(--search-container-background-color);
903-
border: solid 1px var(--search-container-border-color);
907+
font-family: var(--search-font-family);
908+
font-size: var(--search-font-size);
904909
border-radius: 2px;
905-
box-shadow: 0 0 0 2px var(--search-container-box-shadow-color), 0 0 0 1px var(--search-container-box-shadow-inset-color) inset;
910+
box-shadow: 0px 2px 6px var(--search-shadow-color);
906911
}
907912

908913
.djs-search-container:not(.open) {
909914
display: none;
910915
}
911916

917+
.djs-search-input {
918+
position: relative;
919+
}
920+
921+
.djs-search-input svg {
922+
position: absolute;
923+
left: 8px;
924+
top: 7px;
925+
}
926+
912927
.djs-search-input input {
913-
font-size: 1.05em;
928+
font-size: var(--search-font-size);
914929
width: 100%;
915-
padding: 6px 10px;
930+
padding: 3px 6px 3px 28px;
916931
border: 1px solid var(--search-input-border-color);
932+
border-radius: 2px;
917933
box-sizing: border-box;
934+
line-height: 21px;
918935
}
919936

920937
.djs-search-input input:focus {
938+
background-color: var(--search-input-focus-background-color);
939+
border: solid 1px var(--search-input-focus-border-color);
921940
outline: none;
922-
border-color: var(--search-input-border-color);
923941
}
924942

925943
.djs-search-results {
926944
position: relative;
927945
overflow-y: auto;
928946
max-height: 200px;
929-
}
930-
931-
.djs-search-results:hover {
932-
cursor: pointer;
947+
background: var(--search-container-background-color);
933948
}
934949

935950
.djs-search-result {
936-
width: 100%;
937-
padding: 6px 10px;
938-
background: white;
939-
border-bottom: solid 1px var(--search-result-border-color);
940-
border-radius: 1px;
941-
}
942-
943-
.djs-search-highlight {
944-
color: var(--search-result-highlight-color);
951+
padding: 6px 8px;
945952
}
946953

947954
.djs-search-result-primary {
948-
margin: 0 0 10px;
955+
margin: 0 0 3px;
956+
text-overflow: ellipsis;
957+
overflow: hidden;
958+
white-space: nowrap;
949959
}
950960

951961
.djs-search-result-secondary {
952962
font-family: monospace;
953963
margin: 0;
964+
text-overflow: ellipsis;
965+
overflow: hidden;
966+
white-space: nowrap;
967+
color: var(--search-result-secondary-color);
954968
}
955969

956970
.djs-search-result:hover {
957-
background: var(--search-result-selected-color);
971+
background: var(--search-result-hover-background-color);
958972
}
959973

960974
.djs-search-result-selected {
961-
background: var(--search-result-selected-color);
975+
background: var(--search-result-hover-background-color);
962976
}
963977

964978
.djs-search-result-selected:hover {
965-
background: var(--search-result-selected-color);
979+
background: var(--search-result-hover-background-color);
966980
}
967981

968-
.djs-search-overlay {
969-
background: var(--search-result-selected-color);
982+
.djs-search-open .djs-element .djs-outline {
983+
fill: var(--search-preselected-background-color) !important;
970984
}
971985

972986
/**

0 commit comments

Comments
 (0)