Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
29f72c4
Forward ref for CardContent
silkservice Feb 8, 2024
008855b
Merge remote-tracking branch 'origin/release/v23.4.2' into feature/ne…
silkservice Feb 13, 2024
259ded7
Add 'Compare' icon
silkservice Mar 12, 2024
4177206
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Mar 20, 2024
e77a91e
improve style import from libs
haschek Mar 21, 2024
4b2625f
fix and change behavior if onItemClick is executed or not
haschek Mar 26, 2024
d27b058
display card borderless if elevation is set to -1
haschek Mar 26, 2024
4f71075
fix default value for card elevation
haschek Mar 27, 2024
de2a127
add flexible layout helper components
haschek Apr 2, 2024
45982dc
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Apr 8, 2024
668a23a
add user stories for FlexibleLayout* documentation
haschek Apr 9, 2024
522f75f
fix default layout and add property for space usage
haschek Apr 9, 2024
c714281
update changelog
haschek Apr 9, 2024
a147dc0
adjust color for property
haschek Apr 11, 2024
8e6c01d
Merge branch 'develop' into feature/newMappingSuggestion-CMEM-5433
silkservice Aug 27, 2024
2950146
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Sep 24, 2024
c94d340
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Oct 2, 2024
3891bca
Merge remote-tracking branch 'origin/next' into feature/newMappingSug…
haschek Oct 7, 2024
61f849e
added adaptation to change resize direction
arausly Oct 20, 2024
fa6fb3d
started logic for setting max-wdith for resizable nodes
arausly Oct 28, 2024
b8efa4a
fixed undo/redo for resizable nodes
arausly Nov 5, 2024
6c61b90
refactors
arausly Nov 13, 2024
d0aada4
refactors and changes
arausly Nov 18, 2024
1998848
fixed horizontally overflowing evaluation results
arausly Nov 19, 2024
bc6aa05
resizable wrapper fix
arausly Nov 19, 2024
b417911
Add linters to code editor
emir89 Nov 21, 2024
7d7bd45
added resizable feature to linking editor and removed height from bei…
arausly Nov 21, 2024
47a6122
Focus the code editor on load when the "autoFocus" prop is set
emir89 Nov 27, 2024
233a7fb
Update changelog
emir89 Nov 27, 2024
cf472cb
Merge branch 'next' into feature/change-node-width-CMEM-4051
haschek Nov 27, 2024
3016f54
Merge branch 'next' into feature/change-node-width-CMEM-4051
haschek Nov 28, 2024
e933584
Implement support for disabled and intent props in code editor
emir89 Dec 2, 2024
f748b14
Merge branch 'release/v24.0.0' into feature/newMappingSuggestion-CMEM…
andreas-schultz Dec 5, 2024
bce5767
Merge branch 'develop' into feature/newMappingSuggestion-CMEM-5433
andreas-schultz Jan 9, 2025
d3e2250
Add 'Magic wand' as icon name
andreas-schultz Jan 10, 2025
ac704c5
Add changelog entry
andreas-schultz Jan 10, 2025
4f524a0
Resolve conflicts
emir89 Jan 13, 2025
29e32eb
Clean up codemirror.scss
emir89 Jan 13, 2025
f0942ff
Fix yarn.lock
emir89 Jan 13, 2025
3809369
fix lock file for installed packages
haschek Jan 15, 2025
3decd11
Merge branch 'develop' into feature/change-node-width-CMEM-4051
arausly Jan 20, 2025
e488c7b
Reformat props
emir89 Jan 21, 2025
fdb9f4b
Revert text field story props
emir89 Jan 21, 2025
f252938
Re-use blueprint classes
emir89 Jan 21, 2025
0c32887
Implement ContentGroup functionality
emir89 Jan 22, 2025
7c12420
Add ContentGroup stories
emir89 Jan 22, 2025
e43a32b
Export ContentGroup component
emir89 Jan 22, 2025
5939176
Update changelog
emir89 Jan 23, 2025
889fc70
added updates for resizing feature
arausly Jan 23, 2025
8f79eba
Resolve comments
emir89 Jan 29, 2025
65750b1
Omit unnecessary code editor props
emir89 Feb 3, 2025
e2c071c
Fix code editor height
emir89 Feb 3, 2025
98a73ae
Re-use existing type
emir89 Feb 3, 2025
85a1fca
Improve test id implementation
emir89 Feb 3, 2025
9dbe40a
Update "borderMainConnection" to a boolean prop
emir89 Feb 3, 2025
b4b53d2
Set test id as propagated props
emir89 Feb 3, 2025
bdf4113
Set content classname properly
emir89 Feb 3, 2025
f16fe3a
Show context info
emir89 Feb 3, 2025
dac82b9
Improve border gradient implementation
emir89 Feb 3, 2025
e86e655
Add icon as "contextInfo" in a story
emir89 Feb 3, 2025
5e65ccf
Prepare release v24.1.0
haschek Feb 4, 2025
44932f5
Merge pull request #218 from eccenca/feature/codemirror-upgrades-CMEM…
haschek Feb 4, 2025
0c0c983
Bump release version to next release candidate 24.1.0-rc.1
haschek Feb 4, 2025
55491bf
fix changelog and move CodeEditor block to correct release section
haschek Feb 4, 2025
b47024e
Resolve conflicts
emir89 Feb 5, 2025
830feff
explicitely add classnames package as it is used directly now
haschek Feb 5, 2025
edcda32
rename collapse text property to distinct it to other handler names
haschek Feb 5, 2025
038119f
Extend storybook example
haschek Feb 5, 2025
5b7ad54
extend changelog
haschek Feb 5, 2025
d9ee13a
Merge pull request #240 from eccenca/feature/content-group-CMEM-5979
haschek Feb 5, 2025
e99f7e9
Bump release version to next release candidate 24.1.0-rc.2
haschek Feb 5, 2025
a73e953
Merge tag 'v24.0.1' into develop
haschek Feb 6, 2025
689dfbd
Merge remote-tracking branch 'origin/develop' into release/v24.1.0
haschek Feb 6, 2025
b9c9069
use same version number like develop
haschek Feb 6, 2025
fa31e75
Merge pull request #244 from eccenca/feature/alignDevelopWith24.1.0Re…
haschek Feb 6, 2025
a33eae5
Merge remote-tracking branch 'origin/develop' into release/v24.1.0
haschek Feb 6, 2025
883ee97
set correct version for release and rc state
haschek Feb 6, 2025
d4f8024
Bump release version to next release candidate 24.1.0-rc.3
haschek Feb 6, 2025
405a1e4
added fix for skewed widths
arausly Feb 6, 2025
2a2fa93
fixed reset nodes option
arausly Feb 7, 2025
2a66978
added patch for overflowing menu
arausly Feb 10, 2025
3769e4b
added actions property to label
anda2002 Feb 10, 2025
012a70b
small fix
anda2002 Feb 10, 2025
ea67114
fixes
anda2002 Feb 11, 2025
12cb2a6
Merge remote-tracking branch 'origin/develop' into feature/change-nod…
haschek Feb 11, 2025
5aae727
fixes
anda2002 Feb 12, 2025
2c47c96
fix for cursor handles and extra padding
arausly Feb 12, 2025
1d7a989
tentative patch
arausly Feb 12, 2025
d2e61e0
fix
anda2002 Feb 13, 2025
119adde
Merge pull request #247 from eccenca/feature/extend-label-with-action…
haschek Feb 13, 2025
3004f08
Merge remote-tracking branch 'origin/develop' into release/v24.1.0
haschek Feb 13, 2025
f2a7179
fix typo in changelog
haschek Feb 13, 2025
25dd3e0
Bump release version to next release candidate 24.1.0-rc.4
haschek Feb 13, 2025
4d01305
More refactors
arausly Feb 15, 2025
f5dfbfd
test patches
arausly Feb 18, 2025
3738448
Fix: Code editor sets initial value on every code editor instance re-…
silkservice Feb 18, 2025
7774554
Add custom icons for pivot and unpivot operators.
robertisele Feb 19, 2025
a77abb7
corrected isresizable flag and other refactors
arausly Feb 20, 2025
c7d62f4
Merge remote-tracking branch 'origin/develop' into fix/uriPatternEdit…
haschek Feb 20, 2025
9c52178
fixed bug with height expansion
arausly Feb 21, 2025
a6aabd1
Merge branch 'develop' into feature/change-node-width-CMEM-4051
haschek Feb 24, 2025
b95d5d0
node content refactors
arausly Feb 24, 2025
6e0fab8
more refactors
arausly Feb 25, 2025
f033892
removed max-height for nodes since they are all possibly resizable
arausly Feb 25, 2025
365c588
overwrote max-height for resizable, expands based on content
arausly Feb 25, 2025
daaf314
just added markdown example to fiddle with
arausly Feb 26, 2025
56b168e
Add custom icon to ConcatenateToFileOperator
robertisele Feb 27, 2025
1f0bae5
fix node resizing: use correct default size and do not set values for…
haschek Feb 27, 2025
4c3c819
autoformat
haschek Feb 27, 2025
841ab52
update changelog
haschek Feb 27, 2025
ac7290a
changed typescript target
arausly Feb 28, 2025
12ea726
corrected to right min dimensions
arausly Mar 3, 2025
9996d27
Updated gui-elements changelog
robertisele Mar 3, 2025
08cb484
do not render empty tag list items
haschek Mar 4, 2025
3474cd7
add color for projects
haschek Mar 4, 2025
765782d
preserved reset changes in stack
arausly Mar 4, 2025
6184a0f
check resizing for all property changes, otherwise class information …
haschek Mar 5, 2025
358ea04
Refactoring of NodeContent
silkservice Mar 11, 2025
203d3eb
fix initial size, updating initial measures and fix clas enahncement
haschek Mar 11, 2025
3877e5a
Small clean-ups
silkservice Mar 12, 2025
eba8881
Merge pull request #219 from eccenca/feature/change-node-width-CMEM-4051
andreas-schultz Mar 12, 2025
14aef37
add noWrap property to display CardActions without wrapping its child…
haschek Mar 12, 2025
f7175fe
add tooltip property to MenuItem
haschek Mar 12, 2025
c90cbf9
fix type
haschek Mar 12, 2025
0387f63
update yarn lock after develop update
haschek Mar 12, 2025
7a11038
fix type again
haschek Mar 12, 2025
6c442d0
Merge branch 'develop' into fix/uriPatternEditor-CMEM-6461
haschek Mar 12, 2025
ad17d64
Merge branch 'develop' into feature/coloredWorkbenchTags-CMEM-6091
haschek Mar 13, 2025
4cb4eef
Merge branch 'develop' into feature/concatFiles-CMEM-6476
chriswartner Mar 13, 2025
aabf710
Merge pull request #253 from eccenca/feature/concatFiles-CMEM-6476
chriswartner Mar 14, 2025
aab7c64
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Mar 17, 2025
7a75061
Refactor StickyNote to have a combined position and dimension object …
silkservice Mar 17, 2025
f0350ab
refactors for codemirror configs
arausly Mar 18, 2025
03b87b6
Merge branch 'develop' into feature/enhanceFunctionality-CMEM-5576
andreas-schultz Mar 18, 2025
61ab1ff
modified toolbar
arausly Mar 19, 2025
9391bbf
merged develop
arausly Mar 19, 2025
49aecde
refactored toolbar component
arausly Mar 19, 2025
eac36c9
I still had to change the target in tsconfig.json
arausly Mar 19, 2025
7cc3edf
fix hiddenInteractions in OverviewItem, stays visible when it contain…
haschek Mar 19, 2025
30b2b70
Merge pull request #255 from eccenca/feature/enhanceFunctionality-CME…
andreas-schultz Mar 19, 2025
43cd92a
add inline option to label
haschek Mar 19, 2025
5c22939
use always Label component for Switch label
haschek Mar 19, 2025
d5aaedc
Merge branch 'develop' into fix/stickyNotes
robertisele Mar 19, 2025
aa088ec
Merge remote-tracking branch 'origin/develop' into fix/uriPatternEdit…
haschek Mar 19, 2025
e2bb749
Merge pull request #256 from eccenca/fix/stickyNotes
robertisele Mar 19, 2025
dbb2916
Merge remote-tracking branch 'origin/develop' into fix/uriPatternEdit…
haschek Mar 19, 2025
924e2f3
Merge pull request #251 from eccenca/fix/uriPatternEditor-CMEM-6461
haschek Mar 20, 2025
8800e22
Merge branch 'develop' into feature/coloredWorkbenchTags-CMEM-6091
haschek Mar 20, 2025
998b41d
fix changelog sections
haschek Mar 20, 2025
257ec10
Merge remote-tracking branch 'origin/develop' into feature/newMapping…
haschek Mar 20, 2025
35e76e8
added code block and block quote to toolbar
arausly Mar 20, 2025
457b290
Do not mutate original search result in AutoCompleteField
andreas-schultz Mar 20, 2025
3e432e2
removed dependencies and implemented from scratch
arausly Mar 21, 2025
6d64c33
Merge pull request #147 from eccenca/feature/newMappingSuggestion-CME…
andreas-schultz Mar 21, 2025
4936cc0
Merge branch 'release/25.1.0' into feature/coloredWorkbenchTags-CMEM-…
silkservice Mar 21, 2025
4f8c39e
Merge pull request #254 from eccenca/feature/coloredWorkbenchTags-CME…
andreas-schultz Mar 21, 2025
6afcca3
Merge pull request #258 from eccenca/feature/coloredWorkbench-Mapping…
andreas-schultz Mar 24, 2025
f6bb9f9
Merge remote-tracking branch 'origin/develop' into release/v24.1.0
haschek Mar 24, 2025
4e965fb
Bump release version to next release candidate 24.1.0-rc.5
haschek Mar 24, 2025
0b24ccb
upgrade srorybook libs
haschek Mar 25, 2025
4b1a9a3
upgrade babel libs
haschek Mar 25, 2025
2f50d5e
added changelog entry
arausly Mar 25, 2025
946164f
add resolutions for babel packages to fix moderate issues
haschek Mar 25, 2025
11b1a26
force re-rendering of component in storybook after changing property …
haschek Mar 25, 2025
a0c0b8e
fix story rendering
haschek Mar 25, 2025
7f195cc
added preview button
arausly Mar 26, 2025
cde974d
corrected tsconfig , change log and yarn.lock
arausly Mar 27, 2025
bb950cf
Merge remote-tracking branch 'origin/develop' into feature/provideMar…
haschek Mar 27, 2025
b9a3aa4
improve toolbar display
haschek Mar 27, 2025
c98b980
improve code editor styles
haschek Mar 27, 2025
5995aef
fix addition of intent class
haschek Mar 27, 2025
1d0b5a3
prepare toolbar feature to get used for other modes, too
haschek Mar 27, 2025
db3c3e3
add translation callback
haschek Mar 27, 2025
b3f6ceb
align propertiy names for linting and toolbar feature flag
haschek Mar 27, 2025
f7bd650
update changelog
haschek Mar 27, 2025
7f5d90a
display running time after label in case of existing status info
haschek Mar 31, 2025
ece7418
Add wrapLines co CodeMirror useEffect dependencies
fiorsaoirse Mar 31, 2025
ae2d911
Added a changelog entry
fiorsaoirse Mar 31, 2025
264f37c
Merge pull request #259 from eccenca/bugfix/codemirror-dependencies-MT18
haschek Mar 31, 2025
a3ac099
added fix for header
arausly Mar 31, 2025
bb7028e
improvements for headers
arausly Mar 31, 2025
8e097e1
improve code to check/addition of intent class name
haschek Apr 1, 2025
f660197
rename function to display toolbar (and preview in case of markdown)
haschek Apr 1, 2025
c971ee9
did minor refactors, fixes and added comments
arausly Apr 1, 2025
c3bcd1f
fixed cursor issue
arausly Apr 1, 2025
70a71cd
removed redundant import
arausly Apr 1, 2025
af98f40
Merge pull request #257 from eccenca/feature/provideMarkdownEditorFor…
haschek Apr 2, 2025
122044a
Merge remote-tracking branch 'origin/develop' into release/v24.1.0
haschek Apr 2, 2025
0cc633c
add story and documentation for OverflowText component
haschek Apr 2, 2025
6fe0659
improve OverflowText interface, deprecate the allowed usage of proper…
haschek Apr 2, 2025
b3a10ef
fix changelog
haschek Apr 2, 2025
108776b
Merge branch 'release/v24.1.0' into fix/pivotOperator-CMEM-6178
robertisele Apr 2, 2025
f60b501
Merge pull request #260 from eccenca/fix/pivotOperator-CMEM-6178
haschek Apr 3, 2025
0a3852a
adding missing icons to changelog
haschek Apr 3, 2025
4820df9
reduce number of CodeEditor stories
haschek Apr 3, 2025
4ecc0a7
fix disabled and readOnly states for CodeEditor toolbar
haschek Apr 3, 2025
c646ed8
Bump release version to next release candidate 24.1.0-rc.6
haschek Apr 3, 2025
b3123e3
improve description of OverviewItemList and deprecate its densityHigh…
haschek Apr 9, 2025
442e282
improve description of OverviewItemList and deprecate its densityHigh…
haschek Apr 9, 2025
3d51038
add hasCardWrapper and cardProps to OverviewItem, storybook example f…
haschek Apr 9, 2025
f9e75d3
fix whitespace after Depiction in OverviewItem with hasSpacing and hi…
haschek Apr 9, 2025
b56fce5
fix display of rightElement when used together with onClearanceHandle…
haschek Apr 9, 2025
528e97b
Revert CodeMirror change to only fire onChange when the document has …
silkservice Apr 10, 2025
0160f0b
extend argtypes values for icons with tooltip example
haschek Apr 10, 2025
c493458
fix display of Icon with tooltipText in rightElement
haschek Apr 10, 2025
ce06390
manage SearchField internally controlled to allow onClearanceHandler …
haschek Apr 10, 2025
757f4db
updte changelog
haschek Apr 10, 2025
0f64dcf
Validate initial value after AutoSuggestion init
andreas-schultz Apr 11, 2025
61dfc99
Bump release version to next release candidate 24.1.0-rc.7
haschek Apr 14, 2025
92f456f
extend story to test dimensions reset
haschek Apr 16, 2025
ec038c7
fix node content resize reset
haschek Apr 16, 2025
7bf8b70
only accept max values for allowed resizing directions
haschek Apr 16, 2025
90bddad
fix node size reset for the y-axis
haschek Apr 16, 2025
fb8f057
Merge pull request #261 from eccenca/fix/nodeContentDimensionsReset-M…
andreas-schultz Apr 16, 2025
0b41d31
improve changelog, remove doubles
haschek Apr 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .storybook/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Icon, TestIcon } from "../src/";
import { Definitions as IntentDefinitions } from "../src/common/Intent";

import canonicalIcons from "./../src/components/Icon/canonicalIconNames";

// argTypes helpers

const allIcons = new Map([
Expand All @@ -20,17 +21,19 @@ export const helpersArgTypes = {
mapping: {
"Not set": undefined,
Handler: () => {
// eslint-disable-next-line no-undef
alert("clicked");
},
},
},
exampleIcon: {
control: "select",
options: ["Not set", "Test icon", ...Object.keys(canonicalIcons)],
options: ["Not set", "Test icon", ...Object.keys(canonicalIcons), "Icon with tooltip"],
mapping: {
"Not set": undefined,
"Test icon": <TestIcon tryout={LogoReact} className="testclass-icon" />,
...Object.fromEntries(allIcons),
"Icon with tooltip": <Icon name={"item-info"} intent="info" tooltipText="Example tooltip" />,
},
},
exampleIntent: {
Expand Down
80 changes: 80 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,86 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

### Added

- `<CardActions />`
- `noWrap` property to display them without wrapping its children on multiple lines
- `<ContentGroup />` component
- Manage display of a grouped content section.
- Add info, actions and context annotations by using its properties.
- Can be nested into each other.
- `<CodeEditor />`
- implemented support for linting which is enabled via `useLinting` prop
- `turtle` and `javascript` are currently supported languages for linting
- `useToolbar` property to display toolbar if the `mode` is supported
- currently `markdown` mode is integrated, including support for headlines `<h1-6>`, `<blockquote>`, `<code>` block and inline, `<b>` bold, `<i>`, italic, `<del>` strike through, `<ul>`, `<ol>` and checkbox lists, `<a>` links and `<img>` images
- editor is focused on load if `autoFocus` prop is set to `true`
- implemented support for `disabled` state in code editor
- implemented support for `intent` states in code editor
- `<Label />`
- `additionalElements` property to display elements at the end of the label
- `inline` property to display the label component as inline block
- `<MenutItem />`
- `tooltip` property to dislay tooltip on menu item label
- `<NodeContent />`
- `resizeDirections` to specifiy the axis that can be used to resize the node
- `resizeMaxDimensions` to add maximum values for resizing height/width
- `<OverviewItem />`
- `hasCardWrapper` property to use a `Card` component as wrapper around it, simplifies the process to put it in a box, use `cardProps` to forward basic properties to that `Card` wrapper
- `<SimpleDialog />`
- `actionsProps` property to forward `CardActions` properties, e.g. `noWrap`
- New icons:
- `artefact-task-concatenatetofile`
- `artefact-task-pivot`
- `artefact-task-unpivot`
- `item-magic-edit`
- `operation-format-text-code`
- `operation-format-text-bold`
- `operation-format-text-italic`
- `operation-format-text-strikethrough`
- `operation-format-list-bullet`
- `operation-format-list-checked`
- `operation-format-list-numbered`

### Fixed

- `<CodeAutocompleteField />`:
- Code editor resets to initial value on every code editor instance re-init
- `<CodeEditor />`
- re-render the component if the `wrapLines` property is changed after the component's render
- only fire `onChange` event when the document has actually changed
- `<OverviewItem />`
- whitespace after `Depiction` element when the `OverviewItem` ist used with `densityHigh` and `hasSpacing`
- `<OverviewItemActions />`
- `hiddenInteractions` stay visible if they contain focused elements or opened overlays (e.g. context menus)
- `<TagList />`
- do not create empty list items
- `<SearchField />`
- allow to use `onClearanceHandler` and `rightElement` together
- fix display of `Icon` with `tooltipText` as direct child in `rightElement`

### Changed

- `<ActivityControlWidget />`
- display running time after label if there is an status info to prevent a third line
- `<ReactFlow />`
- property color for `graph` configuration was adjusted
- `<SearchField />`
- internally forced to be managed controlled to keep `onClearanceHandler` independent from outer `value` property
- `<Switch />`
- use always `<Label/>` component for `label` value
- `<StickyNoteNode />`
- Refactored data structure position and dimension (breaking change)

### Deprecated

- `<CodeEditor />`
- fallback of static test id is removed, need then always to be set if necessary
- `<OverflowText />`
- component won't accept properties of any name in future, only data attributes for test IDs and basic HTML element properties
- `<OverviewItemList />`
- `densityHigh` property will be removed, use it directly on `OverviewItem` children

## [24.0.1] - 2025-02-06

### Changed
Expand Down
6 changes: 3 additions & 3 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript", "@babel/preset-flow"],
"plugins": [
["@babel/plugin-proposal-private-methods", { "loose": true }],
["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
["@babel/plugin-proposal-class-properties", { "loose": true }]
["@babel/plugin-transform-private-methods", { "loose": true }],
["@babel/plugin-transform-private-property-in-object", { "loose": true }],
["@babel/plugin-transform-class-properties", { "loose": true }]
]
}
47 changes: 27 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@eccenca/gui-elements",
"description": "GUI elements based on other libraries, usable in React application, written in Typescript.",
"version": "24.0.1",
"version": "24.1.0-rc.7",
"license": "Apache-2.0",
"homepage": "https://github.com/eccenca/gui-elements",
"bugs": "https://github.com/eccenca/gui-elements/issues",
Expand Down Expand Up @@ -81,11 +81,14 @@
"@codemirror/lang-yaml": "^6.1.2",
"@codemirror/legacy-modes": "^6.4.2",
"@mavrin/remark-typograf": "^2.2.0",
"classnames": "^2.5.1",
"codemirror": "^6.0.1",
"color": "^4.2.3",
"compute-scroll-into-view": "^3.1.0",
"jshint": "^2.13.6",
"lodash": "^4.17.21",
"re-resizable": "^6.10.1",
"n3": "^1.23.1",
"re-resizable": "^6.10.3",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-flow-renderer": "9.7.4",
Expand All @@ -103,38 +106,40 @@
"xml-formatter": "^3.6.3"
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.26.0",
"@babel/core": "^7.26.10",
"@babel/plugin-transform-class-properties": "^7.25.9",
"@babel/plugin-transform-private-methods": "^7.25.9",
"@babel/plugin-transform-private-property-in-object": "^7.25.9",
"@babel/preset-env": "^7.26.9",
"@babel/preset-flow": "^7.25.9",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@babel/preset-typescript": "^7.27.0",
"@eslint/compat": "^1.2.4",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.17.0",
"@storybook/addon-actions": "^8.4.7",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-jest": "^8.4.7",
"@storybook/addon-links": "^8.4.7",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/cli": "^8.4.7",
"@storybook/addon-actions": "^8.6.9",
"@storybook/addon-essentials": "^8.6.9",
"@storybook/addon-jest": "^8.6.9",
"@storybook/addon-links": "^8.6.9",
"@storybook/addon-webpack5-compiler-babel": "^3.0.5",
"@storybook/cli": "^8.6.9",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^8.4.7",
"@storybook/react-webpack5": "^8.4.7",
"@storybook/test": "^8.4.7",
"@storybook/react": "^8.6.9",
"@storybook/react-webpack5": "^8.6.9",
"@storybook/test": "^8.6.9",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.2",
"@types/codemirror": "^5.60.15",
"@types/color": "^3.0.6",
"@types/jest": "^29.5.14",
"@types/jshint": "^2.12.4",
"@types/lodash": "^4.17.13",
"@types/n3": "^1.21.1",
"@types/react-syntax-highlighter": "^15.5.13",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"babel-jest": "^29.7.0",
"chromatic": "^11.20.2",
"chromatic": "^11.27.0",
"eslint": "^9.17.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.1.0",
Expand All @@ -154,7 +159,7 @@
"rimraf": "^5.0.10",
"sass": "1.62.1",
"sass-loader": "10.3.1",
"storybook": "^8.4.7",
"storybook": "^8.6.9",
"stylelint": "^15.11.0",
"stylelint-config-recess-order": "^4.6.0",
"stylelint-config-standard-scss": "^9.0.0",
Expand All @@ -173,7 +178,9 @@
"**/@types/react": "^17.0.83",
"node-sass-package-importer/**/postcss": "^8.4.49",
"**/cross-spawn": "^7.0.5 ",
"**/micromatch": "^4.0.8"
"**/micromatch": "^4.0.8",
"**/@babel/runtime": "^7.26.10",
"**/@babel/helpers": "^7.26.10"
},
"husky": {
"hooks": {
Expand Down
7 changes: 5 additions & 2 deletions src/cmem/ActivityControl/ActivityControlWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ interface IActivityContextMenu extends TestableComponent {

export interface ActivityControlWidgetAction extends TestableComponent {
// The action that should be triggered
action: () => any;
action: () => void;
// The tooltip that should be shown over the action icon
tooltip?: string;
// The icon of the action button
Expand Down Expand Up @@ -147,6 +147,7 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
{props.label && (
<OverviewItemLine small={small}>
{React.cloneElement(labelWrapper, {}, props.label)}
{timerExecutionMsg && (props.statusMessage || tags) && <>&nbsp;({timerExecutionMsg})</>}
</OverviewItemLine>
)}
{(props.statusMessage || tags) && (
Expand All @@ -170,7 +171,9 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
)}
</OverviewItemLine>
)}
{timerExecutionMsg && <OverviewItemLine small>{timerExecutionMsg}</OverviewItemLine>}
{timerExecutionMsg && !(props.statusMessage || tags) && (
<OverviewItemLine small>{timerExecutionMsg}</OverviewItemLine>
)}
</OverviewItemDescription>
<OverviewItemActions>
{activityActions &&
Expand Down
18 changes: 16 additions & 2 deletions src/cmem/react-flow/StickyNoteModal/StickyNoteModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@ import getColorConfiguration from "../../../common/utils/getColorConfiguration";
import { CodeEditor } from "../../../extensions";
import { ReactFlowHotkeyContext } from "../extensions/ReactFlowHotkeyContext";

import { Button, FieldItem, Icon, SimpleDialog, SimpleDialogProps, Tag, TagList } from "./../../../index";
import {
Button,
CodeEditorProps,
FieldItem,
Icon,
SimpleDialog,
SimpleDialogProps,
Tag,
TagList,
} from "./../../../index";

export type StickyNoteModalTranslationKeys = "modalTitle" | "noteLabel" | "colorLabel" | "saveButton" | "cancelButton";

Expand Down Expand Up @@ -32,10 +41,14 @@ export interface StickyNoteModalProps {
* Forward other properties to the `SimpleModal` element that is used for this dialog.
*/
simpleDialogProps?: Omit<SimpleDialogProps, "size" | "title" | "hasBorder" | "isOpen" | "onClose" | "actions">;
/**
* Code editor props
*/
codeEditorProps?: Omit<CodeEditorProps, "defaultValue" | "onChange" | "preventLinuNumbers" | "id" | "name">;
}

export const StickyNoteModal: React.FC<StickyNoteModalProps> = React.memo(
({ metaData, onClose, onSubmit, translate, simpleDialogProps }) => {
({ metaData, onClose, onSubmit, translate, simpleDialogProps, codeEditorProps }) => {
const refNote = React.useRef<string>(metaData?.note ?? "");
const [color, setSelectedColor] = React.useState<string>(metaData?.color ?? "");
const noteColors: [string, string][] = Object.entries(getColorConfiguration("stickynotes")).map(
Expand Down Expand Up @@ -123,6 +136,7 @@ export const StickyNoteModal: React.FC<StickyNoteModalProps> = React.memo(
refNote.current = value;
}}
defaultValue={refNote.current}
{...codeEditorProps}
/>
</FieldItem>
<FieldItem
Expand Down
5 changes: 4 additions & 1 deletion src/cmem/react-flow/configuration/_colors-graph.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$reactflow-color-graph-node: #745a85 !default;
$reactflow-color-class-node: #3a7896 !default;
$reactflow-color-instance-node: #0097a7 !default;
$reactflow-color-property-node: #ffd54f !default;
$reactflow-color-property-node: #40a691 !default;
$reactflow-color-implicit-edge: #ae3c74 !default;
$reactflow-color-import-edge: $reactflow-color-graph-node !default;
$reactflow-color-subclass-edge: $reactflow-color-class-node !default;
Expand All @@ -13,6 +13,8 @@ $reactflow-color-rdftype-edge: $reactflow-color-instance-node !default;
}

.#{eccgui}-configuration--colors__react-flow-graph {
/* stylelint-disable custom-property-pattern */
// TODO: we should correct custom property names later but atm this would lead to broken consumer apps
--graphNode: #{$reactflow-color-graph-node};
--classNode: #{$reactflow-color-class-node};
--instanceNode: #{$reactflow-color-instance-node};
Expand All @@ -31,4 +33,5 @@ $reactflow-color-rdftype-edge: $reactflow-color-instance-node !default;
--subclassEdgeBright: #{bright($reactflow-color-subclass-edge)};
--subpropertyEdgeBright: #{bright($reactflow-color-subproperty-edge)};
--rdftypeEdgeBright: #{bright($reactflow-color-rdftype-edge)};
/* stylelint-enable custom-property-pattern */
}
3 changes: 3 additions & 0 deletions src/cmem/react-flow/configuration/_colors-workflow.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
$reactflow-color-project-node: #A5356E !default; // Cannot be part of a workflow but we have no other place atm to configure it
$reactflow-color-dataset-node: #3a7896 !default;
$reactflow-color-linking-node: #0097a7 !default;
$reactflow-color-transform-node: #40a691 !default;
Expand All @@ -10,12 +11,14 @@ $reactflow-color-replaceable-input: #faa854 !default;
}

.#{eccgui}-configuration--colors__react-flow-workflow {
--projectNode: #{$reactflow-color-project-node};
--datasetNode: #{$reactflow-color-dataset-node};
--linkingNode: #{$reactflow-color-linking-node};
--transformNode: #{$reactflow-color-transform-node};
--taskNode: #{$reactflow-color-task-node};
--workflowNode: #{$reactflow-color-workflow-node};
--replaceableInput: #{$reactflow-color-replaceable-input};
--projectNodeBright: #{bright($reactflow-color-project-node)};
--datasetNodeBright: #{bright($reactflow-color-dataset-node)};
--linkingNodeBright: #{bright($reactflow-color-linking-node)};
--transformNodeBright: #{bright($reactflow-color-transform-node)};
Expand Down
17 changes: 14 additions & 3 deletions src/components/AutoSuggestion/AutoSuggestion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ const AutoSuggestion = ({
CodeAutocompleteFieldSuggestionWithReplacementInfo | undefined
>(undefined);
const [cm, setCM] = React.useState<EditorView>();
const currentCm = React.useRef<EditorView>()
currentCm.current = cm
const isFocused = React.useRef(false);
const autoSuggestionDivRef = React.useRef<HTMLDivElement>(null);
/** Mutable editor state, since this needs to be current in scope of the SingleLineEditorComponent. */
Expand All @@ -235,12 +237,21 @@ const AutoSuggestion = ({
const pathIsValid = validationResponse?.valid ?? true;

React.useEffect(() => {
if (reInitOnInitialValueChange && initialValue != null && cm) {
if (reInitOnInitialValueChange && initialValue != null && currentCm.current) {
dispatch({
changes: { from: 0, to: cm?.state?.doc.length, insert: initialValue },
changes: { from: 0, to: currentCm.current.state?.doc.length, insert: initialValue },
});
// Validate initial value change
checkValuePathValidity(initialValue)
}
}, [initialValue, cm, reInitOnInitialValueChange]);
}, [initialValue, reInitOnInitialValueChange]);

React.useEffect(() => {
if(currentCm.current) {
// Validate initial value
checkValuePathValidity(initialValue)
}
}, [currentCm.current!!])

const setCurrentIndex = (newIndex: number) => {
editorState.index = newIndex;
Expand Down
Loading