Commit Graph

121 Commits (3fff754cd6d6c8a2359e1db6bcf91ed8a61409c2)

Author SHA1 Message Date
Thomas Bouffard 3fff754cd6
fix: correctly manage the markers fill style (#157)
Previously, when setting startFill/endFill, the display was inverted
comparing to the configuration.
The marker was filled when set to false, not filled when set to true.
When not set, the marker was filled, which is the expected default.

The issue came from a wrong condition to manage the default value and
was reproduced with the Markers Story.

In addition to the code fix, update the Markers.stories.js to fix style
configurations
  - use number instead of string for markers size
  - use boolean instead of number for start/end fill
2023-01-06 16:53:54 +01:00
Thomas Bouffard ee7d0fce6c
fix: Graph importCells/moveCells declare optional parameters (#160)
Also move the JSDoc from implementation to the type declaration. The
documentation is thus made available to consumers.
2023-01-06 14:12:17 +01:00
Thomas Bouffard 5c53465c8e
fix: improve style configuration extensibility (#163)
The type of the `endArrow`, `startArrow` and `shape` properties in
`CellStateStyle` were too strict. They prevented to
use custom registered shapes in the style configuration without using a
cast.

Markers of the arrow and custom shapes can be registered by using
methods in `MarkerShape` and `CellRenderer` respectively.
The key to identify the shapes is a string so the types of the
properties in `CellStateStyle` now allow `string` as well.
These offer both the type guidance for standard maxGraph registered
shapes (via a dedicated type) and the extensibility
for custom shapes.
2023-01-06 10:52:53 +01:00
Thomas Bouffard 097cd90d50
docs: add JSDOc to CellStateStyle properties (#162)
These properties were not documented after the style configuration was
changed (move from the string-based to the object-based configuration).
In mxGraph, the properties were documented in `mxConstants`.
The documentation is created based on `mxGraph`, `typed-mxgraph` and the
current `maxGraph` implementation.

Some properties remains undocumented because they are not used, some
have a wrong type (mainly number instead of boolean). This will be managed
in a next commit.

Co-authored-by: Souchet Céline <4921914+csouchet@users.noreply.github.com>
2023-01-05 11:10:31 +01:00
Thomas Bouffard 5a346079b5
fix: consider default style when computing effective style properties (#152)
`StyleSheet.getCellStyle` didn't keep the properties of the default
style when `baseStyleNames` was set in the `cellStyle` parameter.

The JSDoc was incorrect (it came from mxGraph) about how the style is
computed, in particular about the default style. It probably leads to
the erroneous implementation during migration. It is now fixed and
clearly describe the rules followed to merge style properties.

The 'Stylesheet' story has been updated to correctly use the maxGraph
API. It also includes more examples involving `baseStyleNames` to
show the 'properties merge' in action.
2022-12-17 09:16:26 +01:00
Thomas Bouffard b7a322b36f
fix: CellOverlay constructor use all parameters to set properties (#159)
The `align` and `verticalAlign` values passed to the constructor weren't
set, so the overlay position was always set to
the default one.

The `align` and `verticalAlign` properties are now using the AlignValue
and VAlignValue types respectively instead of
defining inline types. This improves the consistent in the whole code.

To demonstrate the fix, the Overlays story now set 'align' and
'verticalAlign' randomly.


Also introduce `jest` to test the fix and the whole
implementation of the changed method. Types check support is provided by
`ts-jest`. As maxGraph uses a lot of browser objects, also setup
`jest-jsdom-environment`.
2022-12-16 16:51:51 +01:00
Анатолий Майоров 3954001a84
fix: fire selection `CHANGE` event to correct listener (#118)
The `CHANGE` event is now fired to `GraphSelectionModel` instead of `Graph`.
This is the behavior of mxGraph that was mistakenly modified during the migration of the code.
2022-12-08 08:49:02 +01:00
Анатолий Майоров a3b5a60c60
fix: Fix for cells not removed (#115)
There was a logical error in processing `ChildChange` in `Graph`. When cell was removed, `ChildChange` created to change parent of removed cell to `null`. But in code, if parent is null, code to destroy child cell state was not called, so cell stayed rendered on canvas.

The fix add a check for "falsy" parent, so correct branch of code is executed and cells are destroyed.
2022-12-08 08:27:11 +01:00
Thomas Bouffard 36c775bc37
docs: include License and Readme files in the npm package (#144)
The README included in the npm package contains mainly an extract of the
README of the repository and a link to it to avoid too many duplicates.
2022-11-22 07:49:05 +01:00
bihua 92aef9bf11
fix: TouchEvent is not available in Safari and Firefox Desktop (#127)
Add the `window.TouchEvent` guard prior code involving `TouchEvent`.
`TouchEvent` is not available in Safari and Firefox Desktop.

Co-authored-by: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Co-authored-by: Анатолий Майоров <mayorov.ad@outlook.com>
2022-11-20 21:06:03 +01:00
Thomas Bouffard 9e7a6034c7
Apply eslint and prettier autofixes on codebase (#133)
Refactor code based on eslint and prettier rules
2022-11-20 17:03:20 +01:00
Anatoliy Mayorov 53eb5c91a9 fix: typescript transpile error (#138) 2022-11-20 15:00:16 +03:00
Anatoliy Mayorov a3102afa74 refactor: abstract classes, empty methods
Add abstract definition to abstract classes
Fill empty methods blocks with return
Remove unnecessary escapes in regexes
2022-11-20 14:05:46 +03:00
Anatoliy Mayorov 5a29d2fa1a refactor: fix eslint errors
Eliminate unnecessary code
Eliminate var usage
2022-11-20 14:02:48 +03:00
Thomas Bouffard d30e3a239d
Fix edge segment handles not being rendered (#120)
Fixed rendering of handles on segments of edges
2022-11-14 07:23:34 +01:00
Anatoliy Mayorov 2ad1395aab refactor: run eslint and prettier on codebase 2022-10-29 22:53:09 +03:00
Анатолий Майоров 9428ba2a4a
fix: DynamicLoading story, Codec and parseXml (#125)
Fix `DynamicLoading` story
Restored backward compatibility when using `parseXml`
Possible fix for `Codec.decode` method issue
2022-10-28 15:37:02 +02:00
Anatoliy Mayorov d53ea1ad2b chore(tsconfig): move baseUrl to base tsconfig 2022-10-23 11:56:07 +03:00
Anatoliy Mayorov 7e5360ad97 chore(tsconfig): add base tsconfig.json 2022-10-23 10:33:45 +03:00
Thomas Bouffard ef76a1db87
Merge branch 'development' into development 2022-10-22 10:41:32 +02:00
Thomas Bouffard 5b1369b019
Merge pull request #119 from mayorovad/edge-mixin-typo
Fix wrong method signature in EdgeMixin (resetEdgesOnMove).
2022-10-10 07:22:42 +02:00
Thomas Bouffard 4622527af8
Merge pull request #124 from mayorovad/issue-96 2022-10-09 22:32:39 +02:00
Thomas Bouffard 57a8d63ff3
Merge pull request #108 from maxGraph/svgcanvas
Fixes null checks in SvgCanvas2D.
2022-10-09 19:39:49 +02:00
Thomas Bouffard c4f537203b Move layout types to a dedicated types file
These types are only used in the layout classes, so keep them located closed in the folder where they are used.
2022-10-09 19:08:12 +02:00
Thomas Bouffard 7c4b1111ee Apply prettier rules on layout types 2022-10-09 19:02:24 +02:00
Thomas Bouffard b16fa54411
Merge branch 'development' into development 2022-10-09 18:31:25 +02:00
Thomas Bouffard d0a01c2d44
Merge branch 'development' into edge-mixin-typo 2022-10-09 18:30:35 +02:00
Anatoliy Mayorov 1603729a9b fix: types of Hierarchical and Swimlane Layout #96 2022-10-08 21:43:35 +03:00
Anatoliy Mayorov deda3ec03f Fix absolute import path to relative (PR #109) 2022-10-06 16:38:08 +03:00
Anatoliy Mayorov 572af8c459 Fix edge segment handles not being rendered
Combination of side-effects when porting broke
edge segment handles rendering, fixed some of them
2022-10-05 18:43:29 +03:00
Anatoliy Mayorov 19273293a1 Fixed typo in typings of EdgeMixin 2022-10-05 16:50:46 +03:00
mayorovad f84a4a5836 Changed the type of cells map in GraphDataModel 2022-09-26 11:54:20 +03:00
Anatoliy Mayorov b62eb538f7 deps: bump typescript to 4.8.3, fix Dictionary typings
When running `generate-types` script in core package
there is typescript error TS2345 in src/util/Dictionary.ts,
added changes to fix it.

- Moved types IdentityObject and IdentityFunction to types.ts
- Renamed const FIELD_NAME to IDENTITY_FIELD_NAME and
moved it to util/Constants.ts
- Set Cell and CellOverlay to implement IdentityObject
2022-09-24 14:20:53 +03:00
Thomas Bouffard 8c29223b98 Remove remaining commented method signatures including types (dated from the JS to TS migration) 2022-09-24 11:10:04 +02:00
Junsik Shim e986c8ea31 Fixes null checks in SvgCanvas2D #107 2022-09-24 10:58:41 +09:00
Junsik Shim 0a1e797bbc Remove CellArray leftovers. 2022-09-17 19:33:16 +09:00
Junsik Shim ec7a525ea0 Change CellArray to cellArrayUtils. 2022-09-17 18:58:30 +09:00
Junsik Shim 722021006d Fix CellArray related warnings. #96 2022-09-17 18:57:00 +09:00
Thomas Bouffard f9d757548e
doc: update copyright and license in source file headers (#100)
Ensure that all source files contain the Apache-2.0 license and that the 'maxGraph Contributors' are mentioned.
2022-08-30 17:36:33 +02:00
Thomas Bouffard 311514dca3
refactor: clean the Client class (#94)
Remove unused static properties
  - mxForceIncludes: it was used to force loading the JavaScript files in development mode in mxGraph. We are not managing development mode in that way anymore.
  - mxLoadResource: not used anymore
  - mxLoadStylesheets: not used anymore
  - mxResourceExtension: it was only used in Translations, so only keep the Translations settings

Move and rename the link function. It is not a general function, so move it as `domUtils#addLinkToHead`

Fix documentation of static properties
2022-07-16 07:15:04 +02:00
Thomas Bouffard 893ad44ff2
chore: improve the configuration to build the npm package (#87)
Root and all package.json files
  - Fix license, version and authors
  - Remove the non-relevant .npmignore file at the project. It was designed for mxgraph, the whole directory structure
  changed, and we don't plan to publish the root package

`core` package
  - Generate type definition and javascript files for ESM output
    - dedicated folder for `esm` and `types` in the `dist` folder to clearly separate concerns
    - exported in the package.json
  - Add npm script for `npm pack` configuration
  - Drop the `postinstall` npm script that built the `core` bundle. It would have been run when the package is installed
  in dependent projects at dependencies install. And it would have failed as it tries to build the project from TypeScript
  sources that are not available in the npm package.

fix: ConstraintHandler now loads image as everywhere else in the code using `Client.imageBasePath`
Using import doesn't work as the image is not available in the npm package. It generated error like this in ViteJS
project:
Failed to resolve import "../../../images/point.gif" from "../core/dist/esm/view/handler/ConstraintHandler.js". Does the file exist?
This gif import had been introduced to make `Anchors.stories.js` retrieve the gif file. Configuring `imageBasePath` as
already done in other stories fixes the issue.

Don't export EditorCodec and StylesheetCodec as they generate errors.
This is a temporary solution to avoid error in dependent project (at least, with ViteJS projects).
2022-07-05 08:08:25 +02:00
Junsik Shim 3991e7ab1e
Merge pull request #82 from maxGraph/cellstyle
Changed the type of cell style from string to CellStyle.
2022-05-20 09:38:08 +09:00
Thomas Bouffard 760cbd3f05
chore: clean tsconfig.json (#86)
Remove `allowJs` (the whole code is now migrated to TypeScript) and `jsx` (we are not using it).
Don't `skipLibCheck` for stronger type checks.
2022-05-17 12:24:48 +02:00
Junsik Shim 91d9c13286 Changed baseStyleName to baseStyleNames. 2022-05-08 18:05:22 +09:00
Junsik Shim a284987daf Updated comments. 2022-04-28 20:42:12 +09:00
Junsik Shim 07565aae9b Changed the type of cell style from string to CellStyle. 2022-04-17 20:49:09 +09:00
Junsik Shim b51504d7bb Changed the type of cell style from string to CellStyle. 2022-04-17 15:58:35 +09:00
Junsik Shim 0340b72c10 Changed the type of cell style from string to CellStyle. 2022-04-14 14:23:37 +09:00
Thomas Bouffard 443ebf7a52
chore: GitHub workflow generates TypeScript declarations (#80)
This ensures we don't have type errors in the code.

Update tsconfig to only include source TS files.
Previous configuration prevented to run the type generation twice.
The generated d.ts files were considered as source files, so we got file override errors.

Add a dedicated npm script to generate scripts.
We cannot directly call the tsc or lerna commands on the macOS GH actions runner, so introduce the script.
2022-04-03 13:09:24 +02:00
CD Yang 7fa2b433c3
fix: edge handlers use style.edgeStyle (#78)
Use the `edgeStyle` property of `CellStateStyles` in `ElbowEdgeHandler` and `EdgeHandler`.
2022-02-20 17:44:37 +01:00