Alois Klink
92d706f677
Merge commit '16a5fc05d65165f02966eb7f33154f136394a534' into merge-refactor/improving-rendering-shape-types
...
See https://github.com/mermaid-js/mermaid/pull/5974
There were a lot of merge conflicts!
Conflicts:
packages/mermaid/src/rendering-util/rendering-elements/shapes/bowTieRect.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/card.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/cylinder.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/filledCircle.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/flippedTriangle.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/hourglass.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/imageSquare.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/lightningBolt.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/linedCylinder.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/shadedProcess.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/stateStart.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedRect.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedWaveEdgedRectangle.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/triangle.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts
packages/mermaid/src/rendering-util/rendering-elements/shapes/windowPane.ts
2024-10-18 02:49:26 +09:00
Alois Klink
16a5fc05d6
refactor: remove some any types from render()
...
This let's us confirm that the types we're passing to `insertNode()` are
valid.
2024-10-18 01:51:53 +09:00
Alois Klink
62fd359c0e
refactor: convert shapes/util.js to TypeScript
...
Convert the
`packages/mermaid/src/rendering-util/rendering-elements/shapes/util.js`
file to TypeScript at:
`packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts`.
2024-10-18 01:51:53 +09:00
Alois Klink
b0f4ace3a1
refactor: convert rendering-elements/nodes to TS
...
Convert the
`packages/mermaid/src/rendering-util/rendering-elements/nodes.js`
file to TypeScript at
`packages/mermaid/src/rendering-util/rendering-elements/nodes.ts`
2024-10-18 01:51:53 +09:00
Alois Klink
9afb181d06
refactor: correct shapes types
...
All of the shapes in
`packages/mermaid/src/rendering-util/rendering-elements/shapes/` use
`D3.Selection`s as input parameters and as return parameters.
Although, for some reason, passing them to roughjs seems to work?
2024-10-17 22:29:38 +09:00
Alois Klink
cfe7cce41d
refactor: improve types of shapes
...
Instead of being a `Record<string, ShapeHandler>`, the type now knows
every key in the variable.
2024-10-17 18:59:43 +09:00
Ashish Jain
44e7e68e0b
Update alana version to v11.3.0-b.3
2024-10-17 10:57:28 +02:00
Knut Sveidqvist
7d59a624d7
Updating fontsize to 14px
2024-10-16 18:25:27 +02:00
Ashish Jain
e2dc9e557c
Update alana version to v11.3.0-b.2
2024-10-16 14:54:25 +02:00
Knut Sveidqvist
c7adb37a1f
Fix for points to rearrange function for issue when using dagre
2024-10-16 13:52:06 +02:00
Ashish Jain
3b5ca1c638
Updated alana version to v11.3.0-b.1
2024-10-10 14:47:01 +02:00
omkarht
ff9fffef90
fixed resizing issue for iconCircle shape
2024-10-10 17:04:37 +05:30
saurabhg772244
71d6ded224
Fix path highlight for neo icons
2024-10-10 10:23:06 +05:30
Alois Klink
5ecd12de1c
Merge pull request #10 from Mermaid-Chart/export-calcIntersections-and-calcNodeIntersections
...
Export `calcIntersections, calcNodeIntersections`
2024-10-09 22:25:58 +09:00
Alois Klink
ee4991f3e7
docs: regenerate docs
2024-10-09 21:55:04 +09:00
Ashish Jain
1028ca2ffc
Merge branch 'develop' of github.com:mermaid-js/mermaid into neo-new-shapes
2024-10-09 13:24:46 +02:00
saurabhg772244
edce46b305
Merge branch 'neo-new-shapes' of mermaid.github.com:Mermaid-Chart/alana-mermaid into neo-new-shapes
2024-10-09 16:51:50 +05:30
saurabhg772244
2509511135
Fixed neo look for color icons
2024-10-09 16:50:46 +05:30
Sidharth Vinod
2933eb5c28
fix: Build options
2024-10-09 16:44:51 +05:30
Alois Klink
c76a513417
Merge branch 'neo-new-shapes' into export-calcIntersections-and-calcNodeIntersections
2024-10-09 19:31:52 +09:00
Sidharth Vinod
3968010d6b
skip ts build in alana
2024-10-09 15:51:37 +05:30
Sidharth Vinod
122a44024c
fix: change package json import path
2024-10-09 15:44:57 +05:30
Ashish Jain
654c00f88c
Update alana version
2024-10-09 11:47:47 +02:00
Ashish Jain
c5acf870de
Fix broken unit test
2024-10-09 11:34:14 +02:00
Ashish Jain
c73f8d0990
Merge from upstream mermaid os develop
2024-10-09 11:19:40 +02:00
Sidharth Vinod
2b86750cb3
Merge pull request #5924 from mermaid-js/sidv/autoGenerateShapeDocs
...
Auto generate shape docs
2024-10-09 14:11:56 +05:30
Sidharth Vinod
b45224755e
Merge branch 'develop' into sidv/autoGenerateShapeDocs
2024-10-09 13:41:43 +05:30
Sidharth Vinod
14524e1b0e
docs: Optimise document generation
...
Co-authored-by: Alois Klink <alois@aloisklink.com >
2024-10-09 13:39:06 +05:30
Sidharth Vinod
efa47e3176
fix: Docs vitepress build
2024-10-09 13:18:01 +05:30
Sidharth Vinod
1bc45405e0
chore: Generate shape doc before verification
2024-10-09 13:18:01 +05:30
Sidharth Vinod
3720e1a894
docs: Auto generate shape docs
...
Not keen on how it's currently run, open to suggestions on better ways.
2024-10-09 13:18:00 +05:30
Sidharth Vinod
76138cf3b9
chore: Decouple build logic
2024-10-09 13:17:59 +05:30
Alois Klink
2506c29f6b
Merge pull request #5937 from mermaid-js/saurabh/icon-shape-style-fix
...
Fix icon shape color for colored icons.
2024-10-09 07:47:34 +00:00
Sidharth Vinod
463ba6ed6d
Merge pull request #5923 from mermaid-js/sidv/refactorShapes
...
Refactor shapes definition
2024-10-09 13:17:06 +05:30
saurabhg772244
17b783135f
Added pnpm changeset
2024-10-09 12:55:37 +05:30
saurabhg772244
8df2729bd4
Merge branch 'saurabh/icon-shape-style-fix' of https://github.com/mermaid-js/mermaid into saurabh/icon-shape-style-fix
2024-10-09 12:16:05 +05:30
saurabhg772244
a001619464
Move MIT license just before icon definition
2024-10-09 12:15:23 +05:30
Saurabh Gore
3c5a19d297
Merge branch 'develop' into saurabh/icon-shape-style-fix
2024-10-09 11:12:56 +05:30
saurabhg772244
a98290a6e2
remove doc for icon shape
2024-10-09 11:08:27 +05:30
saurabhg772244
9bac464442
Use tropical-fish icon with MIT license in e2e tests
2024-10-09 10:41:37 +05:30
omkarht
aa91874d9e
resolved edge intersection calculation issue for square and rounded form of icon shape
2024-10-08 19:51:28 +05:30
saurabhg772244
4062813d44
Added docs for icon-shape
2024-10-08 17:45:53 +05:30
Sidharth Vinod
29b9d3069b
Merge branch 'develop' into sidv/refactorShapes
2024-10-08 16:15:34 +05:30
Sidharth Vinod
c38d9a6620
Merge pull request #5808 from mermaid-js/renovate/patch-all-patch
...
chore(deps): update all patch dependencies (patch)
2024-10-08 15:11:26 +05:30
Sidharth Vinod
2f65429aa4
chore: Rollback dompurify update range
2024-10-08 15:01:11 +05:30
Sidharth Vinod
c24028f2a4
chore: Separate dompurify updates
2024-10-08 15:00:57 +05:30
autofix-ci[bot]
a20c292653
[autofix.ci] apply automated fixes
2024-10-08 09:17:15 +00:00
renovate[bot]
1c6304b3fb
chore(deps): update all patch dependencies
2024-10-08 09:11:33 +00:00
Sidharth Vinod
3ac93af80c
Merge pull request #5936 from mermaid-js/renovate/major-eslint
...
chore(deps): update dependency eslint-plugin-unicorn to v56
2024-10-08 13:58:24 +05:30
renovate[bot]
ce586e1b31
chore(deps): update dependency eslint-plugin-unicorn to v56
2024-10-08 08:18:32 +00:00
