From b23e0c06428ead39504b83f4259b085975f3f229 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 27 Nov 2025 10:27:57 +0100 Subject: [PATCH 01/20] :sparkles: Add tempfile storage bucket handler test case (#7839) --- backend/test/backend_tests/storage_test.clj | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/backend/test/backend_tests/storage_test.clj b/backend/test/backend_tests/storage_test.clj index 1377dc4f39..a387074c4c 100644 --- a/backend/test/backend_tests/storage_test.clj +++ b/backend/test/backend_tests/storage_test.clj @@ -318,3 +318,35 @@ ;; check that we have all no objects (let [rows (th/db-exec! ["select * from storage_object where deleted_at is null"])] (t/is (= 0 (count rows)))))) + +(t/deftest tempfile-bucket-test + (let [storage (-> (:app.storage/storage th/*system*) + (configure-storage-backend)) + content1 (sto/content "content1") + now (ct/now) + + object1 (sto/put-object! storage {::sto/content content1 + ::sto/touched-at (ct/plus now {:minutes 1}) + :bucket "tempfile" + :content-type "text/plain"})] + + + (binding [ct/*clock* (clock/fixed now)] + (let [res (th/run-task! :storage-gc-touched {})] + (t/is (= 0 (:freeze res))) + (t/is (= 0 (:delete res))))) + + + (binding [ct/*clock* (clock/fixed (ct/plus now {:minutes 1}))] + (let [res (th/run-task! :storage-gc-touched {})] + (t/is (= 0 (:freeze res))) + (t/is (= 1 (:delete res))))) + + + (binding [ct/*clock* (clock/fixed (ct/plus now {:hours 1}))] + (let [res (th/run-task! :storage-gc-deleted {})] + (t/is (= 0 (:deleted res))))) + + (binding [ct/*clock* (clock/fixed (ct/plus now {:hours 2}))] + (let [res (th/run-task! :storage-gc-deleted {})] + (t/is (= 0 (:deleted res))))))) From 1c70f5a36b9a8155ae1f15ce14c404996bce6bb1 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 27 Nov 2025 11:22:15 +0100 Subject: [PATCH 02/20] :bug: Fix boolean operatos shown when there is no selection --- .../workspace/sidebar/options/menus/bool.cljs | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/bool.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/bool.cljs index 4c1fb0d1b7..7181bf9d36 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/bool.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/bool.cljs @@ -38,30 +38,18 @@ (features/use-feature "render-wasm/v1") has-invalid-shapes? - (if render-wasm-enabled? - false - (some (fn [shape] - (or (cfh/frame-shape? shape) - (cfh/text-shape? shape))) - shapes-with-children)) + (some (if render-wasm-enabled? + cfh/frame-shape? + #(or (cfh/frame-shape? %) (cfh/text-shape? %))) + shapes-with-children) head-not-group-like? (and (= 1 total-selected) (not is-group?) (not is-bool?)) - disabled-bool-btns - (if render-wasm-enabled? - false - (or (zero? total-selected) - has-invalid-shapes? - head-not-group-like?)) - - disabled-flatten - (if render-wasm-enabled? - false - (or (zero? total-selected) - has-invalid-shapes?)) + disabled-bool-btns (or (zero? total-selected) has-invalid-shapes? head-not-group-like?) + disabled-flatten (or (zero? total-selected) has-invalid-shapes?) on-change (mf/use-fn From 74d00473e9b197a56efafa9af94591e1b87ff269 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 27 Nov 2025 11:16:36 +0100 Subject: [PATCH 03/20] :sparkles: Add missing render-wasm to the ci workflow --- .github/workflows/tests.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4222373900..a58ccdef78 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,8 +8,6 @@ on: pull_request: types: - opened - - edited - - reopened - synchronize push: branches: @@ -91,6 +89,30 @@ jobs: run: | yarn run lint:scss; + test-render-wasm: + name: "Render WASM Tests" + runs-on: ubuntu-24.04 + container: penpotapp/devenv:latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Format + working-directory: ./render-wasm + run: | + cargo fmt --check + + - name: Lint + working-directory: ./render-wasm + run: | + ./lint + + - name: Test + working-directory: ./render-wasm + run: | + ./test + test-backend: name: "Backend Tests" runs-on: ubuntu-24.04 From 9183dbbc4336ead53683763f97f1cf34fc2e8b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Thu, 27 Nov 2025 11:33:08 +0100 Subject: [PATCH 04/20] :wrench: Fix lint error (rust) --- render-wasm/src/wasm/text.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render-wasm/src/wasm/text.rs b/render-wasm/src/wasm/text.rs index f4dcc12086..1ae81d06b9 100644 --- a/render-wasm/src/wasm/text.rs +++ b/render-wasm/src/wasm/text.rs @@ -292,7 +292,7 @@ pub extern "C" fn set_shape_text_content() { with_current_shape_mut!(state, |shape: &mut Shape| { let raw_text_data = RawParagraph::try_from(&bytes).unwrap(); - if let Err(_) = shape.add_paragraph(raw_text_data.into()) { + if shape.add_paragraph(raw_text_data.into()).is_err() { println!("Error with set_shape_text_content on {:?}", shape.id); } }); From d9ab28e6edb75f4fb07e5d792bb0209fadfc8de2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Nov 2025 09:27:40 +0100 Subject: [PATCH 05/20] :bug: Fix nested clipping --- render-wasm/src/render.rs | 170 +++++++++++++++++++++----------------- 1 file changed, 94 insertions(+), 76 deletions(-) diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index 3875da7f00..ad4c742e33 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -38,12 +38,14 @@ const VIEWPORT_INTEREST_AREA_THRESHOLD: i32 = 1; const MAX_BLOCKING_TIME_MS: i32 = 32; const NODE_BATCH_THRESHOLD: i32 = 10; +type ClipStack = Vec<(Rect, Option, Matrix)>; + pub struct NodeRenderState { pub id: Uuid, // We use this bool to keep that we've traversed all the children inside this node. visited_children: bool, // This is used to clip the content of frames. - clip_bounds: Option<(Rect, Option, Matrix)>, + clip_bounds: Option, // This is a flag to indicate that we've already drawn the mask of a masked group. visited_mask: bool, // This bool indicates that we're drawing the mask shape. @@ -68,13 +70,26 @@ impl NodeRenderState { /// the clipping region to compensate for coordinate system transformations. /// This is useful for nested coordinate systems or when elements are grouped /// and need relative positioning adjustments. + fn append_clip( + clip_stack: Option, + clip: (Rect, Option, Matrix), + ) -> Option { + match clip_stack { + Some(mut stack) => { + stack.push(clip); + Some(stack) + } + None => Some(vec![clip]), + } + } + pub fn get_children_clip_bounds( &self, element: &Shape, offset: Option<(f32, f32)>, - ) -> Option<(Rect, Option, Matrix)> { + ) -> Option { if self.id.is_nil() || !element.clip() { - return self.clip_bounds; + return self.clip_bounds.clone(); } let mut bounds = element.selrect(); @@ -95,7 +110,7 @@ impl NodeRenderState { _ => None, }; - Some((bounds, corners, transform)) + Self::append_clip(self.clip_bounds.clone(), (bounds, corners, transform)) } /// Calculates the clip bounds for shadow rendering of a given shape. @@ -113,9 +128,9 @@ impl NodeRenderState { &self, element: &Shape, shadow: &Shadow, - ) -> Option<(Rect, Option, Matrix)> { + ) -> Option { if self.id.is_nil() { - return self.clip_bounds; + return self.clip_bounds.clone(); } // Assert that the shape is either a Frame or Group @@ -136,9 +151,9 @@ impl NodeRenderState { _ => None, }; - Some((bounds, corners, transform)) + Self::append_clip(self.clip_bounds.clone(), (bounds, corners, transform)) } - _ => self.clip_bounds, + _ => self.clip_bounds.clone(), } } } @@ -554,7 +569,7 @@ impl RenderState { pub fn render_shape( &mut self, shape: &Shape, - clip_bounds: Option<(Rect, Option, Matrix)>, + clip_bounds: Option, fills_surface_id: SurfaceId, strokes_surface_id: SurfaceId, innershadows_surface_id: SurfaceId, @@ -574,40 +589,42 @@ impl RenderState { let antialias = shape.should_use_antialias(self.get_scale()); // set clipping - if let Some((bounds, corners, transform)) = clip_bounds { - self.surfaces.apply_mut(surface_ids, |s| { - s.canvas().concat(&transform); - }); + if let Some(clips) = clip_bounds.as_ref() { + for (bounds, corners, transform) in clips.iter() { + self.surfaces.apply_mut(surface_ids, |s| { + s.canvas().concat(transform); + }); + + if let Some(corners) = corners { + let rrect = RRect::new_rect_radii(*bounds, corners); + self.surfaces.apply_mut(surface_ids, |s| { + s.canvas() + .clip_rrect(rrect, skia::ClipOp::Intersect, antialias); + }); + } else { + self.surfaces.apply_mut(surface_ids, |s| { + s.canvas() + .clip_rect(*bounds, skia::ClipOp::Intersect, antialias); + }); + } + + // This renders a red line around clipped + // shapes (frames). + if self.options.is_debug_visible() { + let mut paint = skia::Paint::default(); + paint.set_style(skia::PaintStyle::Stroke); + paint.set_color(skia::Color::from_argb(255, 255, 0, 0)); + paint.set_stroke_width(4.); + self.surfaces + .canvas(fills_surface_id) + .draw_rect(*bounds, &paint); + } - if let Some(corners) = corners { - let rrect = RRect::new_rect_radii(bounds, &corners); self.surfaces.apply_mut(surface_ids, |s| { s.canvas() - .clip_rrect(rrect, skia::ClipOp::Intersect, antialias); - }); - } else { - self.surfaces.apply_mut(surface_ids, |s| { - s.canvas() - .clip_rect(bounds, skia::ClipOp::Intersect, antialias); + .concat(&transform.invert().unwrap_or(Matrix::default())); }); } - - // This renders a red line around clipped - // shapes (frames). - if self.options.is_debug_visible() { - let mut paint = skia::Paint::default(); - paint.set_style(skia::PaintStyle::Stroke); - paint.set_color(skia::Color::from_argb(255, 255, 0, 0)); - paint.set_stroke_width(4.); - self.surfaces - .canvas(fills_surface_id) - .draw_rect(bounds, &paint); - } - - self.surfaces.apply_mut(surface_ids, |s| { - s.canvas() - .concat(&transform.invert().unwrap_or(Matrix::default())); - }); } // We don't want to change the value in the global state @@ -1228,7 +1245,7 @@ impl RenderState { shape: &Shape, shape_bounds: &Rect, shadow: &Shadow, - clip_bounds: Option<(Rect, Option, Matrix)>, + clip_bounds: Option, scale: f32, translation: (f32, f32), extra_layer_blur: Option, @@ -1372,14 +1389,12 @@ impl RenderState { let mut iteration = 0; let mut is_empty = true; - while let Some(node_render_state) = self.pending_nodes.pop() { - let NodeRenderState { - id: node_id, - visited_children, - clip_bounds, - visited_mask, - mask, - } = node_render_state; + while let Some(mut node_render_state) = self.pending_nodes.pop() { + let node_id = node_render_state.id; + let visited_children = node_render_state.visited_children; + let visited_mask = node_render_state.visited_mask; + let mask = node_render_state.mask; + let clip_bounds = node_render_state.clip_bounds.clone(); is_empty = false; @@ -1462,7 +1477,7 @@ impl RenderState { element, &element.extrect(tree, scale), shadow, - clip_bounds, + clip_bounds.clone(), scale, translation, None, @@ -1550,37 +1565,40 @@ impl RenderState { } } - if let Some((bounds, corners, transform)) = clip_bounds.as_ref() { + if let Some(clips) = clip_bounds.as_ref() { let antialias = element.should_use_antialias(scale); - let mut total_matrix = Matrix::new_identity(); - total_matrix.pre_scale((scale, scale), None); - total_matrix.pre_translate((translation.0, translation.1)); - total_matrix.pre_concat(transform); self.surfaces.canvas(SurfaceId::Current).save(); - self.surfaces - .canvas(SurfaceId::Current) - .concat(&total_matrix); + for (bounds, corners, transform) in clips.iter() { + let mut total_matrix = Matrix::new_identity(); + total_matrix.pre_scale((scale, scale), None); + total_matrix.pre_translate((translation.0, translation.1)); + total_matrix.pre_concat(transform); - if let Some(corners) = corners { - let rrect = RRect::new_rect_radii(*bounds, corners); - self.surfaces.canvas(SurfaceId::Current).clip_rrect( - rrect, - skia::ClipOp::Intersect, - antialias, - ); - } else { - self.surfaces.canvas(SurfaceId::Current).clip_rect( - *bounds, - skia::ClipOp::Intersect, - antialias, - ); + self.surfaces + .canvas(SurfaceId::Current) + .concat(&total_matrix); + + if let Some(corners) = corners { + let rrect = RRect::new_rect_radii(*bounds, corners); + self.surfaces.canvas(SurfaceId::Current).clip_rrect( + rrect, + skia::ClipOp::Intersect, + antialias, + ); + } else { + self.surfaces.canvas(SurfaceId::Current).clip_rect( + *bounds, + skia::ClipOp::Intersect, + antialias, + ); + } + + self.surfaces + .canvas(SurfaceId::Current) + .concat(&total_matrix.invert().unwrap_or_default()); } - self.surfaces - .canvas(SurfaceId::Current) - .concat(&total_matrix.invert().unwrap_or_default()); - self.surfaces .draw_into(SurfaceId::DropShadows, SurfaceId::Current, None); @@ -1596,7 +1614,7 @@ impl RenderState { self.render_shape( element, - clip_bounds, + clip_bounds.clone(), SurfaceId::Fills, SurfaceId::Strokes, SurfaceId::InnerShadows, @@ -1624,7 +1642,7 @@ impl RenderState { self.pending_nodes.push(NodeRenderState { id: node_id, visited_children: true, - clip_bounds, + clip_bounds: clip_bounds.clone(), visited_mask: false, mask, }); @@ -1651,7 +1669,7 @@ impl RenderState { self.pending_nodes.push(NodeRenderState { id: **child_id, visited_children: false, - clip_bounds: children_clip_bounds, + clip_bounds: children_clip_bounds.clone(), visited_mask: false, mask: false, }); From e3b87390f62255dd8120fc26d2711742f3aee191 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Nov 2025 10:57:16 +0100 Subject: [PATCH 06/20] :bug: Fix nested shadows clipping --- render-wasm/src/render.rs | 40 +++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index ad4c742e33..86f6f57d0d 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -383,6 +383,15 @@ impl RenderState { Self::blur_from_variance(total) } + fn frame_clip_layer_blur(shape: &Shape) -> Option { + match shape.shape_type { + Type::Frame(_) if shape.clip() => shape.blur.filter(|blur| { + !blur.hidden && blur.blur_type == BlurType::LayerBlur && blur.value > 0. + }), + _ => None, + } + } + /// Runs `f` with `ignore_nested_blurs` temporarily forced to `true`. /// Certain off-screen passes (e.g. shadow masks) must render shapes without /// inheriting ancestor blur. This helper guarantees the flag is restored. @@ -629,10 +638,20 @@ impl RenderState { // We don't want to change the value in the global state let mut shape: Cow = Cow::Borrowed(shape); + let frame_has_blur = Self::frame_clip_layer_blur(&shape).is_some(); + let shape_has_blur = shape.blur.is_some(); - if !self.ignore_nested_blurs { - if let Some(blur) = self.combined_layer_blur(shape.blur) { - shape.to_mut().set_blur(Some(blur)); + if self.ignore_nested_blurs { + if frame_has_blur && shape_has_blur { + shape.to_mut().set_blur(None); + } + } else { + if !frame_has_blur { + if let Some(blur) = self.combined_layer_blur(shape.blur) { + shape.to_mut().set_blur(Some(blur)); + } + } else if shape_has_blur { + shape.to_mut().set_blur(None); } } @@ -1081,6 +1100,16 @@ impl RenderState { paint.set_blend_mode(element.blend_mode().into()); paint.set_alpha_f(element.opacity()); + if let Some(frame_blur) = Self::frame_clip_layer_blur(element) { + let scale = self.get_scale(); + let sigma = frame_blur.value * scale; + if let Some(filter) = + skia::image_filters::blur((sigma, sigma), None, None, None) + { + paint.set_image_filter(filter); + } + } + // When we're rendering the mask shape we need to set a special blend mode // called 'destination-in' that keeps the drawn content within the mask. // @see https://skia.org/docs/user/api/skblendmode_overview/ @@ -1389,7 +1418,7 @@ impl RenderState { let mut iteration = 0; let mut is_empty = true; - while let Some(mut node_render_state) = self.pending_nodes.pop() { + while let Some(node_render_state) = self.pending_nodes.pop() { let node_id = node_render_state.id; let visited_children = node_render_state.visited_children; let visited_mask = node_render_state.visited_mask; @@ -1632,6 +1661,9 @@ impl RenderState { } match element.shape_type { + Type::Frame(_) if Self::frame_clip_layer_blur(element).is_some() => { + self.nested_blurs.push(None); + } Type::Frame(_) | Type::Group(_) => { self.nested_blurs.push(element.blur); } From 62ec66cd15db8b21b8c581da40ef79e72477ca2b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Nov 2025 11:36:27 +0100 Subject: [PATCH 07/20] :wrench: Adding more e2e tests for nested frames with clipping --- .../get-file-frame-nested-clipping.json | 1089 +++++++++++++++++ .../playwright/ui/pages/WasmWorkspacePage.js | 2 +- .../ui/render-wasm-specs/shapes.spec.js | 16 + ...s-a-file-with-nested-clipping-frames-1.png | Bin 0 -> 24421 bytes 4 files changed, 1106 insertions(+), 1 deletion(-) create mode 100644 frontend/playwright/data/render-wasm/get-file-frame-nested-clipping.json create mode 100644 frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-a-file-with-nested-clipping-frames-1.png diff --git a/frontend/playwright/data/render-wasm/get-file-frame-nested-clipping.json b/frontend/playwright/data/render-wasm/get-file-frame-nested-clipping.json new file mode 100644 index 0000000000..1a4d016d8f --- /dev/null +++ b/frontend/playwright/data/render-wasm/get-file-frame-nested-clipping.json @@ -0,0 +1,1089 @@ +{ + "~:features": { + "~#set": [ + "fdata/path-data", + "plugins/runtime", + "design-tokens/v1", + "variants/v1", + "layout/grid", + "styles/v2", + "fdata/pointer-map", + "fdata/objects-map", + "render-wasm/v1", + "components/v2", + "fdata/shape-data-type" + ] + }, + "~:team-id": "~ueba8fa2e-4140-8084-8005-448635d7a724", + "~:permissions": { + "~:type": "~:membership", + "~:is-owner": true, + "~:is-admin": true, + "~:can-edit": true, + "~:can-read": true, + "~:is-logged": true + }, + "~:has-media-trimmed": false, + "~:comment-thread-seqn": 0, + "~:name": "Nested clipping", + "~:revn": 44, + "~:modified-at": "~m1764151542189", + "~:vern": 0, + "~:id": "~u44471494-966a-8178-8006-c5bd93f0fe72", + "~:is-shared": false, + "~:migrations": { + "~#ordered-set": [ + "legacy-2", + "legacy-3", + "legacy-5", + "legacy-6", + "legacy-7", + "legacy-8", + "legacy-9", + "legacy-10", + "legacy-11", + "legacy-12", + "legacy-13", + "legacy-14", + "legacy-16", + "legacy-17", + "legacy-18", + "legacy-19", + "legacy-25", + "legacy-26", + "legacy-27", + "legacy-28", + "legacy-29", + "legacy-31", + "legacy-32", + "legacy-33", + "legacy-34", + "legacy-36", + "legacy-37", + "legacy-38", + "legacy-39", + "legacy-40", + "legacy-41", + "legacy-42", + "legacy-43", + "legacy-44", + "legacy-45", + "legacy-46", + "legacy-47", + "legacy-48", + "legacy-49", + "legacy-50", + "legacy-51", + "legacy-52", + "legacy-53", + "legacy-54", + "legacy-55", + "legacy-56", + "legacy-57", + "legacy-59", + "legacy-62", + "legacy-65", + "legacy-66", + "legacy-67", + "0001-remove-tokens-from-groups", + "0002-normalize-bool-content-v2", + "0002-clean-shape-interactions", + "0003-fix-root-shape", + "0003-convert-path-content-v2", + "0005-deprecate-image-type", + "0006-fix-old-texts-fills", + "0008-fix-library-colors-v4", + "0009-clean-library-colors", + "0009-add-partial-text-touched-flags", + "0010-fix-swap-slots-pointing-non-existent-shapes", + "0011-fix-invalid-text-touched-flags", + "0012-fix-position-data", + "0013-fix-component-path", + "0013-clear-invalid-strokes-and-fills", + "0014-fix-tokens-lib-duplicate-ids", + "0014-clear-components-nil-objects", + "0015-fix-text-attrs-blank-strings", + "0015-clean-shadow-color", + "0016-copy-fills-from-position-data-to-text-node" + ] + }, + "~:version": 67, + "~:project-id": "~ueba8fa2e-4140-8084-8005-448635da32b4", + "~:created-at": "~m1764144613130", + "~:backend": "legacy-db", + "~:data": { + "~:pages": [ + "~u44471494-966a-8178-8006-c5bd93f0fe73" + ], + "~:pages-index": { + "~u44471494-966a-8178-8006-c5bd93f0fe73": { + "~:objects": { + "~u00000000-0000-0000-0000-000000000000": { + "~#shape": { + "~:y": 0, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:name": "Root Frame", + "~:width": 0.01, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 0, + "~:y": 0 + } + }, + { + "~#point": { + "~:x": 0.01, + "~:y": 0 + } + }, + { + "~#point": { + "~:x": 0.01, + "~:y": 0.01 + } + }, + { + "~#point": { + "~:x": 0, + "~:y": 0.01 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:r1": 0, + "~:id": "~u00000000-0000-0000-0000-000000000000", + "~:parent-id": "~u00000000-0000-0000-0000-000000000000", + "~:frame-id": "~u00000000-0000-0000-0000-000000000000", + "~:strokes": [], + "~:x": 0, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 0, + "~:y": 0, + "~:width": 0.01, + "~:height": 0.01, + "~:x1": 0, + "~:y1": 0, + "~:x2": 0.01, + "~:y2": 0.01 + } + }, + "~:fills": [ + { + "~:fill-color": "#FFFFFF", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 0.01, + "~:flip-y": null, + "~:shapes": [ + "~u571478fd-6386-8085-8007-2b11cd2fc79a", + "~u1a629c22-3d11-80b1-8007-2b2bf3d82765", + "~u1a629c22-3d11-80b1-8007-2b2c061d3786" + ] + } + }, + "~u571478fd-6386-8085-8007-2b11c3aa600f": { + "~#shape": { + "~:y": 440, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Rectangle", + "~:width": 456, + "~:type": "~:rect", + "~:points": [ + { + "~#point": { + "~:x": 669, + "~:y": 440 + } + }, + { + "~#point": { + "~:x": 1125, + "~:y": 440 + } + }, + { + "~#point": { + "~:x": 1125, + "~:y": 609 + } + }, + { + "~#point": { + "~:x": 669, + "~:y": 609 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u571478fd-6386-8085-8007-2b11c3aa600f", + "~:parent-id": "~u571478fd-6386-8085-8007-2b11bf4e9c11", + "~:frame-id": "~u571478fd-6386-8085-8007-2b11bf4e9c11", + "~:strokes": [], + "~:x": 669, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 669, + "~:y": 440, + "~:width": 456, + "~:height": 169, + "~:x1": 669, + "~:y1": 440, + "~:x2": 1125, + "~:y2": 609 + } + }, + "~:fills": [ + { + "~:fill-color": "#B1B2B5", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 169, + "~:flip-y": null + } + }, + "~u571478fd-6386-8085-8007-2b11cd2fc79a": { + "~#shape": { + "~:y": 204, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Board", + "~:width": 535, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 333, + "~:y": 204 + } + }, + { + "~#point": { + "~:x": 868, + "~:y": 204 + } + }, + { + "~#point": { + "~:x": 868, + "~:y": 851 + } + }, + { + "~#point": { + "~:x": 333, + "~:y": 851 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:r1": 0, + "~:id": "~u571478fd-6386-8085-8007-2b11cd2fc79a", + "~:parent-id": "~u00000000-0000-0000-0000-000000000000", + "~:frame-id": "~u00000000-0000-0000-0000-000000000000", + "~:strokes": [], + "~:x": 333, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 333, + "~:y": 204, + "~:width": 535, + "~:height": 647, + "~:x1": 333, + "~:y1": 204, + "~:x2": 868, + "~:y2": 851 + } + }, + "~:fills": [ + { + "~:fill-color": "#FFFFFF", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 647, + "~:flip-y": null, + "~:shapes": [ + "~u571478fd-6386-8085-8007-2b11bf4e9c11" + ] + } + }, + "~u1a629c22-3d11-80b1-8007-2b2c061d3788": { + "~#shape": { + "~:y": 1173, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Rectangle", + "~:width": 456, + "~:type": "~:rect", + "~:points": [ + { + "~#point": { + "~:x": 1254, + "~:y": 1173 + } + }, + { + "~#point": { + "~:x": 1710, + "~:y": 1173 + } + }, + { + "~#point": { + "~:x": 1710, + "~:y": 1342 + } + }, + { + "~#point": { + "~:x": 1254, + "~:y": 1342 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c061d3788", + "~:parent-id": "~u1a629c22-3d11-80b1-8007-2b2c061d3787", + "~:frame-id": "~u1a629c22-3d11-80b1-8007-2b2c061d3787", + "~:strokes": [], + "~:x": 1254, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 1254, + "~:y": 1173, + "~:width": 456, + "~:height": 169, + "~:x1": 1254, + "~:y1": 1173, + "~:x2": 1710, + "~:y2": 1342 + } + }, + "~:fills": [ + { + "~:fill-color": "#B1B2B5", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 169, + "~:flip-y": null + } + }, + "~u1a629c22-3d11-80b1-8007-2b2c061d3787": { + "~#shape": { + "~:y": 1042, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": true, + "~:name": "Board", + "~:width": 518, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 1106, + "~:y": 1042 + } + }, + { + "~#point": { + "~:x": 1624, + "~:y": 1042 + } + }, + { + "~#point": { + "~:x": 1624, + "~:y": 1466 + } + }, + { + "~#point": { + "~:x": 1106, + "~:y": 1466 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c061d3787", + "~:parent-id": "~u1a629c22-3d11-80b1-8007-2b2c061d3786", + "~:frame-id": "~u1a629c22-3d11-80b1-8007-2b2c061d3786", + "~:strokes": [], + "~:x": 1106, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 1106, + "~:y": 1042, + "~:width": 518, + "~:height": 424, + "~:x1": 1106, + "~:y1": 1042, + "~:x2": 1624, + "~:y2": 1466 + } + }, + "~:fills": [ + { + "~:fill-color": "#dc0606", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 424, + "~:flip-y": null, + "~:shapes": [ + "~u1a629c22-3d11-80b1-8007-2b2c061d3788" + ] + } + }, + "~u571478fd-6386-8085-8007-2b11bf4e9c11": { + "~#shape": { + "~:y": 309, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": true, + "~:name": "Board", + "~:width": 518, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 521, + "~:y": 309 + } + }, + { + "~#point": { + "~:x": 1039, + "~:y": 309 + } + }, + { + "~#point": { + "~:x": 1039, + "~:y": 733 + } + }, + { + "~#point": { + "~:x": 521, + "~:y": 733 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u571478fd-6386-8085-8007-2b11bf4e9c11", + "~:parent-id": "~u571478fd-6386-8085-8007-2b11cd2fc79a", + "~:frame-id": "~u571478fd-6386-8085-8007-2b11cd2fc79a", + "~:strokes": [], + "~:x": 521, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 521, + "~:y": 309, + "~:width": 518, + "~:height": 424, + "~:x1": 521, + "~:y1": 309, + "~:x2": 1039, + "~:y2": 733 + } + }, + "~:fills": [ + { + "~:fill-color": "#dc0606", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 424, + "~:flip-y": null, + "~:shapes": [ + "~u571478fd-6386-8085-8007-2b11c3aa600f" + ] + } + }, + "~u1a629c22-3d11-80b1-8007-2b2c061d3786": { + "~#shape": { + "~:y": 937, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Board", + "~:width": 535, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 918, + "~:y": 937 + } + }, + { + "~#point": { + "~:x": 1453, + "~:y": 937 + } + }, + { + "~#point": { + "~:x": 1453, + "~:y": 1584 + } + }, + { + "~#point": { + "~:x": 918, + "~:y": 1584 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:blur": { + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c031523df", + "~:type": "~:layer-blur", + "~:value": 4, + "~:hidden": false + }, + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c061d3786", + "~:parent-id": "~u00000000-0000-0000-0000-000000000000", + "~:frame-id": "~u00000000-0000-0000-0000-000000000000", + "~:strokes": [], + "~:x": 918, + "~:proportion": 1, + "~:shadow": [ + { + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c0899422b", + "~:style": "~:drop-shadow", + "~:color": { + "~:color": "#000000", + "~:opacity": 1 + }, + "~:offset-x": 40, + "~:offset-y": 40, + "~:blur": 4, + "~:spread": 0, + "~:hidden": false + } + ], + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 918, + "~:y": 937, + "~:width": 535, + "~:height": 647, + "~:x1": 918, + "~:y1": 937, + "~:x2": 1453, + "~:y2": 1584 + } + }, + "~:fills": [ + { + "~:fill-color": "#FFFFFF", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 647, + "~:flip-y": null, + "~:shapes": [ + "~u1a629c22-3d11-80b1-8007-2b2c061d3787" + ] + } + }, + "~u1a629c22-3d11-80b1-8007-2b2bf3d82765": { + "~#shape": { + "~:y": 937, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Board", + "~:width": 535, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 333, + "~:y": 937 + } + }, + { + "~#point": { + "~:x": 868, + "~:y": 937 + } + }, + { + "~#point": { + "~:x": 868, + "~:y": 1584 + } + }, + { + "~#point": { + "~:x": 333, + "~:y": 1584 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:blur": { + "~:id": "~u1a629c22-3d11-80b1-8007-2b2c031523df", + "~:type": "~:layer-blur", + "~:value": 4, + "~:hidden": false + }, + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82765", + "~:parent-id": "~u00000000-0000-0000-0000-000000000000", + "~:frame-id": "~u00000000-0000-0000-0000-000000000000", + "~:strokes": [], + "~:x": 333, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 333, + "~:y": 937, + "~:width": 535, + "~:height": 647, + "~:x1": 333, + "~:y1": 937, + "~:x2": 868, + "~:y2": 1584 + } + }, + "~:fills": [ + { + "~:fill-color": "#FFFFFF", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 647, + "~:flip-y": null, + "~:shapes": [ + "~u1a629c22-3d11-80b1-8007-2b2bf3d82766" + ] + } + }, + "~u1a629c22-3d11-80b1-8007-2b2bf3d82766": { + "~#shape": { + "~:y": 1042, + "~:hide-fill-on-export": false, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": true, + "~:name": "Board", + "~:width": 518, + "~:type": "~:frame", + "~:points": [ + { + "~#point": { + "~:x": 521, + "~:y": 1042 + } + }, + { + "~#point": { + "~:x": 1039, + "~:y": 1042 + } + }, + { + "~#point": { + "~:x": 1039, + "~:y": 1466 + } + }, + { + "~#point": { + "~:x": 521, + "~:y": 1466 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82766", + "~:parent-id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82765", + "~:frame-id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82765", + "~:strokes": [], + "~:x": 521, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 521, + "~:y": 1042, + "~:width": 518, + "~:height": 424, + "~:x1": 521, + "~:y1": 1042, + "~:x2": 1039, + "~:y2": 1466 + } + }, + "~:fills": [ + { + "~:fill-color": "#dc0606", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 424, + "~:flip-y": null, + "~:shapes": [ + "~u1a629c22-3d11-80b1-8007-2b2bf3d82767" + ] + } + }, + "~u1a629c22-3d11-80b1-8007-2b2bf3d82767": { + "~#shape": { + "~:y": 1173, + "~:transform": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:rotation": 0, + "~:grow-type": "~:fixed", + "~:hide-in-viewer": false, + "~:name": "Rectangle", + "~:width": 456, + "~:type": "~:rect", + "~:points": [ + { + "~#point": { + "~:x": 669, + "~:y": 1173 + } + }, + { + "~#point": { + "~:x": 1125, + "~:y": 1173 + } + }, + { + "~#point": { + "~:x": 1125, + "~:y": 1342 + } + }, + { + "~#point": { + "~:x": 669, + "~:y": 1342 + } + } + ], + "~:r2": 0, + "~:proportion-lock": false, + "~:transform-inverse": { + "~#matrix": { + "~:a": 1, + "~:b": 0, + "~:c": 0, + "~:d": 1, + "~:e": 0, + "~:f": 0 + } + }, + "~:r3": 0, + "~:constraints-v": "~:top", + "~:constraints-h": "~:left", + "~:r1": 0, + "~:id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82767", + "~:parent-id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82766", + "~:frame-id": "~u1a629c22-3d11-80b1-8007-2b2bf3d82766", + "~:strokes": [], + "~:x": 669, + "~:proportion": 1, + "~:r4": 0, + "~:selrect": { + "~#rect": { + "~:x": 669, + "~:y": 1173, + "~:width": 456, + "~:height": 169, + "~:x1": 669, + "~:y1": 1173, + "~:x2": 1125, + "~:y2": 1342 + } + }, + "~:fills": [ + { + "~:fill-color": "#B1B2B5", + "~:fill-opacity": 1 + } + ], + "~:flip-x": null, + "~:height": 169, + "~:flip-y": null + } + } + }, + "~:id": "~u1dc9717a-2217-80f7-8007-2b11bac2823f", + "~:name": "Page 1" + } + }, + "~:id": "~u44471494-966a-8178-8006-c5bd93f0fe72", + "~:options": { + "~:components-v2": true, + "~:base-font-size": "16px" + } + } + } \ No newline at end of file diff --git a/frontend/playwright/ui/pages/WasmWorkspacePage.js b/frontend/playwright/ui/pages/WasmWorkspacePage.js index 851bb8af49..d594232c47 100644 --- a/frontend/playwright/ui/pages/WasmWorkspacePage.js +++ b/frontend/playwright/ui/pages/WasmWorkspacePage.js @@ -42,7 +42,7 @@ export class WasmWorkspacePage extends WorkspacePage { } async waitForFirstRenderWithoutUI() { - await waitForFirstRender(); + await this.waitForFirstRender(); await this.hideUI(); } diff --git a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js index f1d9b46dd8..040cf66953 100644 --- a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js +++ b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js @@ -258,6 +258,22 @@ test("Renders a file with nested frames with inherited blur", async ({ await expect(workspace.canvas).toHaveScreenshot(); }); +test("Renders a file with nested clipping frames", async ({ page }) => { + const workspace = new WasmWorkspacePage(page); + await workspace.setupEmptyFile(); + await workspace.mockGetFile( + "render-wasm/get-file-frame-nested-clipping.json", + ); + + await workspace.goToWorkspace({ + id: "44471494-966a-8178-8006-c5bd93f0fe72", + pageId: "44471494-966a-8178-8006-c5bd93f0fe73", + }); + await workspace.waitForFirstRenderWithoutUI(); + + await expect(workspace.canvas).toHaveScreenshot(); +}); + test("Renders a clipped frame with a large blur drop shadow", async ({ page, }) => { diff --git a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-a-file-with-nested-clipping-frames-1.png b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-a-file-with-nested-clipping-frames-1.png new file mode 100644 index 0000000000000000000000000000000000000000..5d41d8eb513dd0d224e3177cdf3ff3dd3e6ff028 GIT binary patch literal 24421 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 literal 0 HcmV?d00001 From 8840246425a4f7017551576ad5363261de1a6cb7 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Nov 2025 11:59:52 +0100 Subject: [PATCH 08/20] :bug: Fix bleeding masks --- render-wasm/src/render.rs | 4 +- render-wasm/src/shapes.rs | 83 ++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index 86f6f57d0d..e331e4781f 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -1103,9 +1103,7 @@ impl RenderState { if let Some(frame_blur) = Self::frame_clip_layer_blur(element) { let scale = self.get_scale(); let sigma = frame_blur.value * scale; - if let Some(filter) = - skia::image_filters::blur((sigma, sigma), None, None, None) - { + if let Some(filter) = skia::image_filters::blur((sigma, sigma), None, None, None) { paint.set_image_filter(filter); } } diff --git a/render-wasm/src/shapes.rs b/render-wasm/src/shapes.rs index 5e986e78a5..5fb84f6610 100644 --- a/render-wasm/src/shapes.rs +++ b/render-wasm/src/shapes.rs @@ -885,19 +885,50 @@ impl Shape { scale: f32, ) -> Bounds { let mut rect = bounds.to_rect(); - let include_children = match self.shape_type { - Type::Group(_) => true, - Type::Frame(_) => !self.clip_content, - _ => false, - }; - if include_children { - for child_id in self.children_ids_iter(false) { - if let Some(child_shape) = shapes_pool.get(child_id) { - let child_extrect = child_shape.calculate_extrect(shapes_pool, scale); - rect.join(child_extrect); + match self.shape_type { + Type::Group(Group { masked: true }) => { + let mut mask_rect: Option = None; + let mut content_rect: Option = None; + + for (index, child_id) in self.children.iter().enumerate() { + if let Some(child_shape) = shapes_pool.get(child_id) { + let child_extrect = child_shape.calculate_extrect(shapes_pool, scale); + + if index == 0 { + mask_rect = Some(child_extrect); + } else { + match content_rect.as_mut() { + Some(r) => r.join(child_extrect), + None => content_rect = Some(child_extrect), + } + } + } + } + + match (mask_rect, content_rect) { + (Some(mut mask), Some(content)) => { + if mask.intersect(&content) { + rect.join(mask); + } + } + (Some(mask), None) | (None, Some(mask)) => { + rect.join(mask); + } + (None, None) => {} } } + + Type::Group(_) | Type::Frame(_) if !self.clip_content => { + for child_id in self.children_ids_iter(false) { + if let Some(child_shape) = shapes_pool.get(child_id) { + let child_extrect = child_shape.calculate_extrect(shapes_pool, scale); + rect.join(child_extrect); + } + } + } + + _ => {} } Bounds::from_rect(&rect) @@ -1426,6 +1457,7 @@ impl Shape { #[cfg(test)] mod tests { use super::*; + use crate::state::ShapesPool; fn any_shape() -> Shape { Shape::new(Uuid::nil()) @@ -1485,4 +1517,35 @@ mod tests { assert_eq!(shape.selrect().width(), 20.0); assert_eq!(shape.selrect().height(), 20.0); } + + #[test] + fn masked_group_extrect_matches_mask_intersection() { + let mut pool = ShapesPool::new(); + pool.initialize(3); + + let group_id = Uuid::new_v4(); + let mask_id = Uuid::new_v4(); + let content_id = Uuid::new_v4(); + + let group = pool.add_shape(group_id); + group.set_shape_type(Type::Group(Group { masked: true })); + group.children = vec![mask_id, content_id]; + + let mask = pool.add_shape(mask_id); + mask.set_shape_type(Type::Rect(Rect::default())); + mask.set_selrect(0.0, 0.0, 50.0, 50.0); + mask.set_parent(group_id); + + let content = pool.add_shape(content_id); + content.set_shape_type(Type::Rect(Rect::default())); + content.set_selrect(-10.0, -10.0, 110.0, 110.0); + content.set_parent(group_id); + + let extrect = group.calculate_extrect(&pool, 1.0); + + assert_eq!(extrect.left, 0.0); + assert_eq!(extrect.top, 0.0); + assert_eq!(extrect.right, 50.0); + assert_eq!(extrect.bottom, 50.0); + } } From 63959a22cc37ba164df56608cb2b1aa128a0b292 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Nov 2025 12:51:37 +0100 Subject: [PATCH 09/20] :bug: Fix svg attrs --- frontend/src/app/render_wasm/api.cljs | 6 +++--- render-wasm/src/render.rs | 12 +++++------ render-wasm/src/shapes.rs | 31 ++++++++++++++++----------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/frontend/src/app/render_wasm/api.cljs b/frontend/src/app/render_wasm/api.cljs index ba5525791e..8e6f8f0e14 100644 --- a/frontend/src/app/render_wasm/api.cljs +++ b/frontend/src/app/render_wasm/api.cljs @@ -475,9 +475,9 @@ (dissoc :style) (merge style) (select-keys allowed-keys)) - fill-rule (or (-> attrs :fill-rule sr/translate-fill-rule) (-> attrs :fillRule sr/translate-fill-rule)) - stroke-linecap (or (-> attrs :stroke-linecap sr/translate-stroke-linecap) (-> attrs :strokeLinecap sr/translate-stroke-linecap)) - stroke-linejoin (or (-> attrs :stroke-linejoin sr/translate-stroke-linejoin) (-> attrs :strokeLinejoin sr/translate-stroke-linejoin)) + fill-rule (-> (or (:fill-rule attrs) (:fillRule attrs)) sr/translate-fill-rule) + stroke-linecap (-> (or (:stroke-linecap attrs) (:strokeLinecap attrs)) sr/translate-stroke-linecap) + stroke-linejoin (-> (or (:stroke-linejoin attrs) (:strokeLinejoin attrs)) sr/translate-stroke-linejoin) fill-none (= "none" (-> attrs :fill))] (h/call wasm/internal-module "_set_shape_svg_attrs" fill-rule stroke-linecap stroke-linejoin fill-none))) diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index e331e4781f..b1d3607fe7 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -645,14 +645,12 @@ impl RenderState { if frame_has_blur && shape_has_blur { shape.to_mut().set_blur(None); } - } else { - if !frame_has_blur { - if let Some(blur) = self.combined_layer_blur(shape.blur) { - shape.to_mut().set_blur(Some(blur)); - } - } else if shape_has_blur { - shape.to_mut().set_blur(None); + } else if !frame_has_blur { + if let Some(blur) = self.combined_layer_blur(shape.blur) { + shape.to_mut().set_blur(Some(blur)); } + } else if shape_has_blur { + shape.to_mut().set_blur(None); } let center = shape.center(); diff --git a/render-wasm/src/shapes.rs b/render-wasm/src/shapes.rs index 5fb84f6610..cb334a6f00 100644 --- a/render-wasm/src/shapes.rs +++ b/render-wasm/src/shapes.rs @@ -908,7 +908,7 @@ impl Shape { match (mask_rect, content_rect) { (Some(mut mask), Some(content)) => { - if mask.intersect(&content) { + if mask.intersect(content) { rect.join(mask); } } @@ -1527,20 +1527,27 @@ mod tests { let mask_id = Uuid::new_v4(); let content_id = Uuid::new_v4(); - let group = pool.add_shape(group_id); - group.set_shape_type(Type::Group(Group { masked: true })); - group.children = vec![mask_id, content_id]; + { + let group = pool.add_shape(group_id); + group.set_shape_type(Type::Group(Group { masked: true })); + group.children = vec![mask_id, content_id]; + } - let mask = pool.add_shape(mask_id); - mask.set_shape_type(Type::Rect(Rect::default())); - mask.set_selrect(0.0, 0.0, 50.0, 50.0); - mask.set_parent(group_id); + { + let mask = pool.add_shape(mask_id); + mask.set_shape_type(Type::Rect(Rect::default())); + mask.set_selrect(0.0, 0.0, 50.0, 50.0); + mask.set_parent(group_id); + } - let content = pool.add_shape(content_id); - content.set_shape_type(Type::Rect(Rect::default())); - content.set_selrect(-10.0, -10.0, 110.0, 110.0); - content.set_parent(group_id); + { + let content = pool.add_shape(content_id); + content.set_shape_type(Type::Rect(Rect::default())); + content.set_selrect(-10.0, -10.0, 110.0, 110.0); + content.set_parent(group_id); + } + let group = pool.get(&group_id).expect("group should exist"); let extrect = group.calculate_extrect(&pool, 1.0); assert_eq!(extrect.left, 0.0); From dc8a07099d5d44a9448197d388299b59c3b86a21 Mon Sep 17 00:00:00 2001 From: Elena Torro Date: Thu, 27 Nov 2025 13:38:51 +0100 Subject: [PATCH 10/20] :bug: Fix vertical align default case --- frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs index 517ce5bff8..4862b5a7e6 100644 --- a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs @@ -317,7 +317,7 @@ max-height (max height selrect-height) valign (-> shape :content :vertical-align) y (:y selrect) - y (if (> height selrect-height) + y (if (and valign (> height selrect-height)) (case valign "bottom" (- y (- height selrect-height)) "center" (- y (/ (- height selrect-height) 2)) From 0735140f074bf31bffff9b4e6d05bb7138e308cd Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 27 Nov 2025 13:16:08 +0100 Subject: [PATCH 11/20] :wrench: Change concurrency rules on tests github workflow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a58ccdef78..a67d4a5449 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ on: - staging concurrency: - group: ${{ github.ref }} + group: ${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: From a940c08da942390fc6ad18201341f06ec0c8dfeb Mon Sep 17 00:00:00 2001 From: Alonso Torres Date: Thu, 27 Nov 2025 13:02:47 +0100 Subject: [PATCH 12/20] :bug: Fix problem with worker bundling in development (#7844) --- frontend/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 3016db8bcd..6eb48efa4a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,6 +27,7 @@ "build:storybook:cljs": "clojure -M:dev:shadow-cljs compile storybook", "build:app:libs": "node ./scripts/build-libs.js", "build:app:main": "clojure -M:dev:shadow-cljs release main worker", + "build:app:worker": "clojure -M:dev:shadow-cljs release worker", "build:app": "yarn run clear:shadow-cache && yarn run build:app:main && yarn run build:app:libs", "e2e:server": "node ./scripts/e2e-server.js", "fmt:clj": "cljfmt fix --parallel=true src/ test/", @@ -44,9 +45,9 @@ "translations": "node ./scripts/translations.js", "watch:app:assets": "node ./scripts/watch.js", "watch:app:libs": "node ./scripts/build-libs.js --watch", - "watch:app:main": "clojure -M:dev:shadow-cljs watch main worker storybook", + "watch:app:main": "clojure -M:dev:shadow-cljs watch main storybook", "clear:shadow-cache": "rm -rf .shadow-cljs", - "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"", + "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run build:app:worker\" \"yarn run watch:app:main\" \"yarn run watch:app:libs\"", "watch": "yarn run watch:app:assets", "watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"", "watch:storybook:assets": "node ./scripts/watch-storybook.js" From 8f5a81e179fdcde781fe11ee439595fcb8ddb6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?andr=C3=A9s=20gonz=C3=A1lez?= Date: Thu, 27 Nov 2025 16:03:11 +0100 Subject: [PATCH 13/20] :books: Add info about boolean variants (#7828) --- docs/img/variants/07-variants-boolean.webp | Bin 0 -> 16816 bytes docs/user-guide/design-systems/variants.njk | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 docs/img/variants/07-variants-boolean.webp diff --git a/docs/img/variants/07-variants-boolean.webp b/docs/img/variants/07-variants-boolean.webp new file mode 100644 index 0000000000000000000000000000000000000000..894c5f45db28685451a800d0ec32c7661e5efe58 GIT binary patch literal 16816 zcmV(>K-j-hNk&GfK>z?(MM6+kP&iDRK>z?Rp8`7oO*nGf$dTZH-X6I3{|}y-P8*LA z{ht8r%Dw+8m9*Ky5OcDfh1@eGNyg0WNW9s%C2SY~W*3K^M020)@Vp3p>1()57cC*@ zB~5*l)B~UtlLG)qhD$JwQUn(d@rp0O;~)uwz6FG>5bSNMskc z7@v|igYz;0@H+dV)>BBiMH%MMg)Jwg?A7vrSwQaSLRx>kvwle?G^bl?{cOMm6mR0CH zLz+G%sQ017d~KCFkKW zdcp$h$^D;z09JYxHVXWQ_JR)2=Bk1@I~l+HYtc^3JEa@?lWyHZhW>EX2t+^4pYT$> z#oGJ|2l3qN&^k}K|IW}D9^4IA$JeVZx%%z~^!(D(a7K4VcUHQ)JcF0;5^G!M?`ic^ zv;qnM@Y|G$Ck{}ox}h-!W$+mV0I0!Jy+sVbOMu26Jh&D{oUy>D(2%6moa)srNtvXi zE8QiXbQKlZP-2PKhrdT^PR%U<{)9hqbEX-Z)2a`&&duD-$|6)6v=?QPeohvlPzV5Y zbcK#qWNAm%EbXW}-|1)VKfjEjo#Lj^Jaj>a&z=x_i+Bp64NKBqUVrx2G0|Rnb>}Vt z09a6>BuxN-zRial`Z1r3+Apk98i)H6WYA|^%uoQ?XGIjvN;$jV@1knu_T2ZtXWp_ zmO>Fap%Z$$(Y{7|D}Hofi6`DRU6CT?Mq#0>^r<;D7fWn!C1u3|00301SW)qV72jL& zZpW}xPxU3JRG1lWfz(_b00u&x5CTZjBEQR%aoM%+?%`+Xt;q!jT>Tq{8X7K^ zQ}pmF)^^h9@5~o&hE334*vXakH@_!0rE7I)%PIZLQj0`p)tf8HD z=3Z&UQ%Fd@J#91AO;%5m1`v~dX!mKZZ7*@F?)!uUlwYeJz4!BOJ!#v%&W-zjuQwD( z#Z@Y)q>@V5Vp#^ETTNyM8pF)Y%*@Q3G`pGIY>s7SNtWG`EGA1OSCxwE4Ff?)vK77; zkqu;)Xi$@$2KT_zOqr8yFeg)Qd$q%tJ`+ z&Z*5VoqyYW`Qh1gBuTPtRUS3RKt*D`$Jp`vijy$`c%yB5Wa~=LI%o|M=f*h9qr65U?B1uy7n%!f*$1=mGp(7@s$pr>@_o{HveQ(Vu zofjwf|DFHu{D0^FJOAH*d&dc9ky4~dJkcXDny4sQL8ZkDO%1QD#C23 zA|xizwk^mXo~K%0(YBWpIBl|zNe(nu5V)kt!!u9Tmzj5$+u=+!q((>9%OHpotFK)3 zQFoq4Ua1EMK&}_3>Eg;yb-~T| zuULQoBJ_=k{*@*GAyDAN-N&vVyE7df^#>;q$dJXS#+!`Er`pp=qdw1D zwnKftts*c5GB@YeJGx_RUhf%)Xzh1>MTStD7*R?n11!kJ!FZ!+A}7!ha3V?UDAW_q zK7R84D?_}m3;KGsiCa85nMkJSOu!jupSk2upBKeDfA6*xwe}ak%HLt=wKozkfdxxA zYx!k#`#>0A1V!{n<}xclhzK!DX1?~(;t-2%Xe^he!c^hNYYI{AY0rLk8UE#=J=o); zQ^By?m_5h4_AnYOMTkY06(mVeKtot)fI+lGgLr4E702cxiiR+IUaXluj3yU~nCx`N zuZ}baSU|!-h#J^XJhAx`7ljy^&TFh$cU-)NV^Pqvaq;Br`TO&pxL>?izMfwYlc(@@ zC=aVY>o?U-6T4(SUc5e!cL#%~o8{&9oL|-3wDc^K%ge3ZIp~z--%4C$S6@H($tNR^ zK?oEiuKB__2VYINHFvlP5i}c)&XpL9S~Nu>&1OkUa6Jr_=`b-D7wHLd6b7ydZ2(C0 z8ucEL#VQ*2^V-jn6;=nJOEjf36%;wtUp z@g=J-xgY$)^;*Bb3I1|G{jbth=FC{y`tWt|a=6VR*(}V-Kyjd}m-m%;)@&0o0007Y z1LD5QjDoJGn*lV*{gfG|oFPxIZTh?z`-)458t9pT;_|L=blT(it}VYoS6SI^KR&2N zheHO{k>w`hjPu#3^Z|)l6z2OScmC(LAy!PD44K)RLo9X7s#+@_BhWTZfvmS*YCnf<9VR)wx-T5jI1 zvR@PklmO_;O4lAsQf`=5#MoaXx~^HVE*lR$-cU^7m!(dwA_^SdZ4{+9+qo_E#?xsK zT^X>Flo2ezL<9@qNwFg8+*`osCc|pexp7I`Jsk!D^FS*Xft_)E1Z5kWy0DhR2}wZ` zH9p;>8t>i^bigV$cf&Vh3OT9caCbdvy9h47xD}z>$UN%0{juHHdU>db$Ay4;HqO1` zDJ~*uSqEi#w%e>wv1N`3u)o!hm~;sW@>tl}BGx-p3-fLOH*q2K^WFp$>453nw2Vbz zeLyad$pkq-(**)Ca1bF0tj7ei$OlIm&~0c_Xcsn!*ciYwb6Zc?(%}7kR=VVoV(MN%NDXK)RWMdg+>{|l)g60qTvJwJWA4I|MapJ?1Ka9t zB#pCVRwBTTGIa@bip?`(KCF*=ZsmcpLGFS808LCW2o^prqJjd2;v^~qZAnI16yU&5 zgh;S@lVc6bmMlbEs%snL4FRAmD-q+R57ZQh`#JTvtnfr7A354OIT8SA16Ghv(Ek7) zzd+D)cP>PhNIlMI&Qp@WjhKL1j=%#Him-(L<`BY(ms-;R3=%8$ymM&7CB&>vuOAYs|FI;Jib%~Nk zkF-n&dyqSeDzPr1ZMbIkFqL-U0i3PSsZ;CLraZyszI0RRHQ32Ilq zy>{qUpi*bJLdS#*;bBb)cXyGaZCW;k`JC)T=hpOlr0q&_;HJ1uOPT}Is&J>_GO~rw zFzio*-I!>Mf~2mH*$$1FW+9l{Y$faegia5nrQ{ByN?YF@5#r?k>*b2Y2BR3y*# zp_Wz4rvu=~lqNQOvq-x?ON0WD!o_nMk>vj&fJnLCz?uaBUY1K@buJNx{KC5n0Y$Bx zb1V^|BTOX7t+CGYoO3tZqkc+Usn1O6)`Vd9@=_PJGCfgXrJgTS=A;lzL|NmM6L!Sa z7Hsq;_hszp99w1>TyN;jE*t?u07%dx1pqx^rsNRpP-XRcnAX;%A9q6-XqPFbbttpP z+&U#rVX;3PcmA-jcb2w58FPzyDRha2ug;>4fWTmNt=))SVl9Z*=+d)8oR9BzEwfcl zmMIPjsUfvlVcWi900_D;FBz{~d8VuakZVdO3ure8f@C>i!g!fLT>x(k1i3oSQ`ICRoxB^J7CwVPP!<$F zFNgPS4C{@gjl`U!6M*Xugb4sV3sJoCNVsc28;w#Tsl;ZHX#aQM*CZH%S4=EO#y~T} z9nNY$h_etu1oLtC(4DOF5O;)n@F-7e*hlPf`+aW3q03e%lUt4lpOk}6Yp>;Q1X2q8 zTM3kcJ!3!HeeOddfg!%re;)WPfBr-oe8+d!H~jkJZg_#=FE`5WQw#vG;(ZoOUcmD1 zA6|M5L14M$>i(A9-R%{8ivi%o%+P-J|Ej@l*qsOfcEbR8W&j*U0f1-P!HnqAt`xKl zF}8T)kZl(9t>=nG{QUX@^j%0SGP(g!WUHjS1dv*c3$x?MW+FoH?dXvsp!=Xt05}nV zNQN)rL_jp?1|rnQ4Bhhp00;yC!IRK!Kml)upaF2)T+Cb`(Etcqd@;#IVvz&@XzOD1 z_Uzsz>8Hc^$vqyiK6xaJ&F!lT2O$UEq^Q2Vj^@B&v^^Rlhp}aOdMm}{=E}PeMIw&7 z%OO-KG)|^827M9c8L@p4vb7p&3@7*ho&WC-BVjbO)I~smcy$;I=3N*e@;uVb^AYmvp8kf#(;J z(De+P2cd^5p^G3z=mAMWmluMsBy?#c{A@0CHNy6X(1XN+UsO=4711v~9ED$SMhw^F zNtbg0j4I)WT6B;cr)k;9wPSN9@{+hJaLVNQXvwrt#E`!pum7!-uvsAU6Q0~F0ygXQ z&3=!o&3A@Te7&khgges=y)a$gKkUor+dp|pWEg0&QJU7J3r3~(T;wVN)7AqLR2lI@ zWn3W(;gYheLySYsfNMaOYmP6gr;I7nV^@iF^MujNHh8#!W<_pTjYE`+%$An7Yn>#LN)o|jzv}l$+_ujtqEOeLKc^AuRTL3Zg%>tDoVT-fK9u)x;xRnaX@iOan0y~uX{ z6{}<1_U;g|P$eKl5?$puIc_wqbH+&5-}W(0EMld|?bU5zEJu_wtj3nW za9Q*rC`KS)jS4xH77?;NXnjX99zgo96{&Y_medXaaVbyL)^OhTXOKoAAiSkrNEJ zq&YFG5AqVYF_IS6I31Uc)&WSfBcjX}!)Wu=rQdg#&30i=^K8@B>{E@^#>)8{V{|od zxy{Z#QukKo_dkq?M5#HU$uh@hU59w@%>rjFDn+n~PrH6nUFqa`ag}cL%dKyA4xxCO zz9iqVo5Z%2pNAvgYtkNlsb~o#mT2+vF2}y@EUx;xvpoDfs)Zkl#ss5lESHwB$2xiI zDNBj5hLHVVh7zFopIO&H(?aDHe&MxL+ppACrFmRdG1w4`;VkE@OEsi(IvE9OTurD6 zsS9AUqAd}T;YUYR$n~**IDytmzzyoGG(yLrW1><3kb%QnK3l?ipf1Kr$`&~RVx6pX zi4|HMTimd#y%=YQcf(HKUi-H1STK7IxMbP2-TFFA`P}?w)x)`A-k`^aDS_nfaYYNo zH+{`+o@{ituev51;T1Z4 z70%N=n`pP%jjaSl5y=~0qj4rk9Zg2c%CoBqIw`QQjvGAlqEN@i1K>2vI}B!51nR=W zq=xj?bb?~{VJGaXp1P8!t>Qbe-k^NZ$A{e1<(ku#@g`EYi`4MNjBA(PTzi5PtZ+sL z<3J5`I%Ul+!nAn6ky=G9C>1!liFpl*7z4;_r7~`DyB2^7B%sTrKi5arLR%!M;2ZDF z?ysi0{9BD(Z}Qd!m#Jlbp*nv72xH)tibKJ$tT9*K8C!#JKhw0mR*O2(X;D>FtvNEg zCfqHY+UagZ-!e`xf8v0(MCtsGP99=7qT_8k#n!e7X*g-gig;U&`olmR5m?_~btz1Tx|3$h zn`9sIPsStB)?~2c@igwP>fqz9V&vGg%-ts4d=+sl6}D?;scv`g)bX+I32M$Gy7G+u zRmhe$@jjgXuH76w$QyHB-W}O@$w@sr$7%2GuTeeNgbid$da^R^KE``>$D} zH3RG=9eo+_ZL@k8&odZa|uq80yf03vj7Eq#@R|u8~L-sb%J8RGpI8l z!<|-463;8>w|m=n;1Q2EHgP9)H-B-(wyFKHr!xlqo>YQ)B3KgGXBL^0U0D&`4 zv~fd+(Kv68v<5#vjva)&3e|X+4cmi+)Lt(R|ZxZ^MuC{N#M?7g__|aXeFK*38V{D1H zm?q8es%!v@rFrRTFgE=&IJCRW>uo_wGpgBH(2&Ghupv61<*|oX$ucnGv5&^l8s7?9 zTc>NkJl=>u28uCm{|4jC?FDd%I{*{W0@&sG>&b632z)*LZ}y0|m%=bap}-PR;3+}{*ZcN5(3Au8iTKaA-ne=Lo9!M9H(@wfB?g-m;3!Zb zVg_zlDJF;@z$G967OP`P*JgZGnO;(+DX9^^{2J+x@U8dJTkj|PZF&nnd)(45lZpfVH0geo~Qh`E}mIEguh)9JOa5~i$ zLoNK=lg=!qI*KDiUTAH160D9h|5sLN+3l5OnmK%aZ{&BacR$=XehR2AP|0&;!lo9F zAF8!UE3VQ2_@4tRJTZQ+w|LHG!)!LH75-^<+}& zQ7tuwzqmjpzRwVAL~QVESJ5@Q z&B9jcp2tyX4E$MB1q-!vABSPgMwOiBaieLp`!Jq3$@v+h+>2FGA=yYOsZVU)-DIjR zLG%}ADvr<=k%g))&CaxMf7j^+PlM9>B`LL4#u#1w}^t)vID8#Y_Q5ipwGGQ=!U()^EWAN=EDrDf!@<<13*oA++(QIl&0wF^>)q@DC| zU?B=uoE=jq+TFTFE>Yf>X^+x)48~4Ht!bRa^$T$V9{&t*^OseyWc{`-c;bNlG|3S# z0H4x63lI{IobmH z+$d!L3}!0B0RtSs7-|+MY`jnY`b<@ae=HZ=LaEX=Y})yhjaxSY6azUH46T%p8Y_L= z^-*bEQ(DF>Vk-Xa2Pa$!+F0Lhc$k7hX6(|3lPa1zfE63aBzgr92;uk@gT;1(?-#s$ z#dzF{%U;NN81_cF0rUwE7ny76)YRubH}bU@tx40s0b|Go3Wc#2iy0~>tbXr?@NPf8 zm>bR-&R@TxJomg0J_^N&Ng(a^_%T1Vq4p>Yd71IKiMt@vaof5wUK>hP^lV{lLP9hp zrNY7)YRDx(Sy3p_!dO9|;PqgI2e+7K(K!D?`L$_5YL^sNjDn3qSw|?a%!tmg(UOjn zM9L;WYD90@$XF{N;k0Q($4GP01g&B_a!_`P(OCGadgzPR1S&G%2nG(uuoH>_iA|wr z*UeW=rrS_C^DBtNZvuz>>uVPD>Xs%!Qd<;+4V6tcT>yjc-Q5L^T5T^*CAaeOGZMAY zR?OO33ze4L4rel?JySyDbaU#WgPrOLT0Q|m%$oI*;M11o9HwXeV^PSiR29(8bi`pyWM#?C{mf* zAd?|%s)wU>HjZF`V~jFQGSLjg7+I=CFZ6Lha>EH|x?Ox(!iXGdP*$v#v+H3Z>eT`k4S6SkTvWA+GqG7$qjFj-&(Fb#F5lK@3 zo1bRFSI(^5pAOvNprUn5C{B4xbS&wVV+beAW7M_}kpKg)z-eJ($5gcLGNi!N0TH4N z9C$Xi0o)s@f^oL3N{xy#sHoBH7=uqJtXkzHUFaxhA2*in46p+D?gSISM5op?KBsa< zyF%7nGRk$-Y6|MI$*wkia}#K|$R@@|tn^sqj;Cy;ta3?Yr78~UnP@%IXbD8ArK$7; zxl_f_*xF!kbq(Ej5?VkT17HHk)T0HFaX^Sn%K^2x#_tmbA?;+xE9ZOo-qcCU(|dR46)pN z8ye15UUbD3U5sYt3Z$JC9xJIn4nu2q3k+40m>kOd#z7Dco8HAscsei&V&+apcuDRt2CgN@a5HJoH0Gm{Tp?S=S{XG1YRaPL6>D+PIMKdjC5552 zIh-6MX)lDWm5<94)J9{sXGRKxsd5)f|*3<4KRXvO+K6x_4>=2z}LpOd& zjViyK;x!WSbdvtm8@_X^PG$wjpdj+K)51+>cFpbEbX{o*b0)`CfP?$tin`ZnZSl+M z(V1Z#465hK_`G^uq&`{4%q2Z@la}zE6;C8CfTFXAd|syE)~jnD)EGo1f*5x~Ii8vK zhq9NhEI(hb@(wlPCSnWc-esk5sgP=%%&aV8o3$3I8&pZ$18T5qqy1ZjSy6%1oGdJq z(G*IdP|mLTPc4nJjd0=MFbz8 zD+5y~r@}V1+PX-GKIgG{ma@tDX-|rl_a~KLX`etX0lEQ*79bZ^ebr#*1_}jKr-}ZfG`|tz!y{=93MmpvfcIe;Zaifopb z%G1dZ8M0&bQJ-$n+AD8pX}{cE?3TH5ieG2G{wv520`0C1T1Jy9>~zAFx1kEfBmJbe ze2!(_JI2V*AXU}tx$e~Bzkfu47|4eA17(Zo?`=R}SrAoB>sGDHzby6G4Kr_j*Lv?? zc**AC{5p699XqPw(gOHz*(~j;%#B>&wKk@*IAxh-0=o31B_I}(T?W0qBk2@~Ruy?^ zI?WW_%+p(^+sOay|KxuKq?2760)O@jIKTMKG*{*Yrd7ed0YWlt8~V|^!*-3iV%w@oz6f73P3E~bB&~oO*(QW%74y&{CX28l3g6&r`ZjH z-J1&%o#UhYqSdNP!lh3KzMx&A){faqvX5Wv--tI1e71nbq;Tf7R@X_nmc+Ht&tLKQ&)mKY-s zZ%_#Tm$xxGAicgQ+RiG$)T_ul_#*0QWPuija*QJ@j9Sj zQ~T?A#+aYkT87Wu+}r}>j65AsiSZXoX;S0LH?#@_v5js*fcgMJJbJWW&~}5a_%mJA06rh@^%1gfb<$C|T0`V6L;$FlgGkj>CwMK8Wwm0Fxp{#x^xDmp zj&mCdmn#oz_xvpCssluz4mAYekXwiV5TG6)(Dcf>EtUs6p02f;G9S;)od(wnn;??} za$JVty8-7UYKxXz0TJ{KK(uzyU)FduV-&H1(BPp`!I-7 z&0b-hfePU{xB>?WJALHu?+OsdfEogD+7rA-fM^W>^{|L-xmk`mgoc^rZobRrnBpyDI!oqV0DO+w|Ge`Mp$eOibmdw z$6iFN%Piw+<8aMMfK-L482RZU2hizR^Z??90EeXAw+mVYf#~kp6D`9gPEg(#HD(2= z>9BD=v5r}uvQOEtmbdkkF4ipQi~rpeb{r96wr8uVXYcarKE zg||C`m0OuTOK-Px=rCe8Hen3N)zWZdh? z^7$(2+$#5b?^U@_8akbHhVdc#CV;bT0El*Vd{HJpF$2|YJ?_Mj9=UFIx0|9yct{H$ zio`%gWTtxbH7F**d8X6qPi@CFrpMCXjM!Aop-TUd^O?-gSGZandWgqyEgNY!wdR_Q z<)T6aha3^CR%KQ;+2b!X-}NAFg`rO3ZGdE#qEoaA2d`~Eum8jEls_mc&hwh18e4A0 zaSgyV_TNfkZ?!}1DXUa^8l2gSoXWSomLHcAHko`or=$;ZJYR#MxQ%F`Jdmec`ZYS|l za3%#&S}3{ve}IwG=1$F^E$hH~Um1yBJWNxI**Q~!`hf?{f$s9rkwhJk z9lI9YNg_eB{r9J|!Z{KxiZw?L9Nq01njBELg0?PFxhxN1K?rfk&&f{5MHGH7(e-eK z>??!J*Ip3#VN<`|;D+(J?+Xs+=1}CYdogmS-DmYNz5Hnd+t^o%z1_l!G(M;4J#XPf z+cl;MrRYGF;KXR%H^vNwf{9DK=*?n0C)5Gt&P2~CagT*%$!^e^n5vRTJZ^KZ;Ql^sH_p^rYN*eh1d?yD&{gI;#wNZT|r=Z{ZmK`#)_qKIq)N;&-6*-L1wD# zGR3DbsCFdNydWD|=|9w3QjHWiI?N*6oj3Jap)^vlnIWbJopzs%hrHzz{`>>hq4yQ> zWJAtvC}{Av(=B0_Z0oiEz?&^Fs=Q8&`an4+rCdsBJnhtPz6v@4a+;)UyKxaT<$hIj z(Wt5nj?wJYo`bu))F|sKoMGHIWBjS^h!$q>R|;hlLxPd7>6_o$_~^I3z*4QYlNud6 zovnw}lor}UAH6a7O#%3pN>#ZU*~y^x*iu}M*;07g_gUdI#BM}eFi59^vvQ^vKksEn zomJQ)gDVZb9FyWKrEB~G*yI5VWF3N$4iP`g9TN*ioxE=f?ugT1)-Bq5+p>zT)tH>ie9SI+j%4}i{bBO>gT5-% z`e{0)AUZ>_@G(C!)YEuNx=Y15iufDPY!Nr2n>HT#Brk43$|^8MeV)tZT*&=eseE12 z43TtmYP33eBO>UW;8U+!i@d^`QK^{8_ix<=_tI*Vec1Wju~A_qj3iR9QIO7wT+kPj z5yt2mZ1&D8%1Tw>@4|f_DxHL369BNrhk<{$Z6jy$%g%N-wM%rBAK6z;F^jSwSiWzn z;l|ZRdvX8lDbje{>9#xnNq2LzYaV`FrNhV=`T6|E=S>aDB?V+<%GyK~cn9E+yAV)= z?gT#hx=+1RP7s7q*t{P8xLfz_F!E<)+yT7)FA_4A{Kz7jZa=8{+6}bz`V3pYb0Wzx zD;%LYZ$j7C(+o`>7F$_V^Fn7nrqxfcF8PxCDw2Dv=dx^kt#7OkvB4JIgz-39tgYC@ z?y2toe9fU%PpASLl{1%1DMZ{=d_1TK8 zR#J{izu0@EzUr>wNzBHD0(V+UNoki-&o!@!=z_%6X8iDl!q43hxDi#c-M+t-^apIL zq+oxkgWd4V{^+Mt&2_1gr4r41G>J$W^i?)jEe(OSgR4Gtx=U9N>x5&eLJsh`c--UQ z{w{wK!nnf|ik0=k^5}3K#be8!hw_eMfO^GH9Xz>W-qQ-(SscHo@Vd{Cv(8|! zqecV|hZw5mID+Zw%Q8pSuA{VE6(Tp?^8dq%mSm-U)7gCApO3+{ z;c}A;u!CpQiK{p3{2L$J=HxIlSo+pOZCqp*ag2p`gr$nZCLb$O^^i7RM-2L?FYGxY zv@zjWIOtW(1ApkVv7^rw^KO0bYu_vcd=Bae7<*+;XYx+K(zOv(8UaveeyWK0hoEwM zijIbDrgaRT9cc@Mbi=UXGySLm*(+3<%AjYa0&NVI>{zOnJ zqGR!{ajg>tiLPRy2V-h$63i$ZJH_Z4=FY7(=quIITvUOd;LYg`F%0e!TH`&6fRyR9!*%$~KR>=(`20@W;~M+4o}=x=D~lRN1Hn4f z%gWXRivCdg*Vj7b%&}hC7U>_3JiVx7a^U^0M=?X6dQ-h!0g`k`Ahk3A4G0!Upa3K~ zJ-uEFGi}$_WjO^>*;&}7C|KXN#=5Tb_;S_~;6nFpBkr0|uv3+6c3J+^W|V^I2s(kf zF+FD4Cg&?DAAWOw&UAZ*%SLR-a!Tpu3VvJOw~GIq5{l38KTr``9(;V-Ya8YylyfGY zAXplJh7th~3pi<#vbVmToo#oGhcPTb2VZw`4MnS>*w>XDuVT_gG~=taB&7g;CsJ*) zEY&!xT^2lA$);plu$uy>N{9Lx?MSolO1~@h1JuQlXL95;E3+NXx_?CnJ0@2G2!fUG zppH-fdgadp=|Hv!mX={==bAW&+9vUIFJn+er+1d=u8rBFd_$DZ>b)W~No;<_vXhFA zxUyqyun$-@naLP7b0PTzpSzO}yxO8dtm^+Wvyq5a2$2RfH~-?4LB`XsV)nO7YjcIm zq&02jmZSFx1CYHac0s7Uncw9J!cZzfv>*g5LuswS3XloTi?AvpyP)t`;n(T|H+k9k zr}X8(=jp}EUYXJXgjtx3J_D-62fi&cMG;jR zl2CiWsIivNIeqeE0ijUsP}S+v!=XzMCk`qR(m^1AWiW&TiG(vO&ljRt$5U1_Pv=&) z9@+JDwLX>Sya2Hf3&esY;&l5o+nYV6}{mg$*L^IWnpuVs_PyHF4a0T zO8l#hN)MWzrqdAd;>r>hp@Uk)fNOaB&r3NPd79!%*Oxw8OABJN^T{UH1ik0^mQ`BN z0Er3DX}1!V+ROIbZ2CmU#ZE|^U5-Whaf6|*g?;ZbuAKsKT(%KH0h8MHl&&^At=&68 zhRfysJqr>CAqJIA@+sv%7OQ1hnZolVVpdFn$xG!iHnwHod#|ERw;uLwqa=4ECP{-* z>JrJT!Qe^qq{g_`yiK_c=s?GC-b76&GCH62)b`BmM3j{d(FvIrggBt#;F)+npCcI= zDa!?`oy+@*>!UrSpZ>ZOsT3)3|B_f-g6k+r^T9tl=hAc()-}gk6B}}yS-^;J`t$|o zQJ_;e*vfWP3ujHQdbc4;kgBvGTLc0$AYa$jFIBNT`nZvdOx!O_Y%r{uBEuPgq)43d z7*sL*W0JT*I_M1kVS1zSv2A#IMJF;0=UL27pW@3tdOO?H-|Tt^*0lRp1Bt3}&w?<- zVApkB^HDxpV8KYbN)daEeli~yCZ;fP2`R-JlDWhoNtLQN`NwoXH9g$amiB5}di&A| zf=ER|%6SE=DOFjhKvGvGb`+sH3w5>I+nx9Cdw1>K>7D=H-|GA~Nl1u$4q~`f?N@%~ za=FZpq#7-h>8cp*u!eq2VbjH3%qz$Ub>l)eH&(G+cCXcx-C>A zPM$iSd5+YMd}N@wZk|icB3-_%mYW<&FD&*}^X}LOl(B)Ir`r??=&a~6)=QbKWWKON z%zHAN(A07hSZub!AvKKF1t>T*)eua3rbR3>S|9*ca09YSDs&F(?B zPqu|$gtp8gWQ&wOzlirfK28I3dRxm|le3yAS7IyW267YBjpjsK8-o!6nHBKrs7*$5 z4YDY4EO*6E&3l;-MlWk3v)DtS;jpm5(*@UB2chSyb`ZH z)7!h>fj!>9&2qO3+uRtd$Y;2A6ftAyy$(;fEt}Mt)0}CZK{@v!Q7*;$aSG6bW{)E?gpF_z$r^9z9pez)Z>^Q`)#?|#0g7chlfDJVFAxY&QwRmstyk=dVWuw za6vM$gxD}QvvvnIn>sK(Y8P(DZiz{8zznZe+7$+m(Yu^7y*&oN*pz$c&+jo;hX*3Z;01nrF1ih)mfOt|ti z?W0PL%8Bl$59ZHie}CPa)>t(&ZhaSbQ~cBx1&}qZk#v-&wRw&*H;seQP`i)%rA$tQ zdoxUuYhk-H-8Ikv0KAu#g8-193MInnc}?*_+@^Wd`cH~Fl$|!3$y{K zp>+F6AN-_&0C*{`n~4g2T6 zp^iaf<_*Vo#+MI0icYp@TV zvoY!o*FfP5X|=6n1L+j|P$uRz53Ce+y~8#(E750u+b8Ht-W~J9iNutjD7O#7b)n_a z1*+tr)7@lnq)~B=!q?Osa+{3kb_!4m6mImCZ@ug%Llpc5 z;uZJ;!9*;+c-clz!aD_LVBXZyWPM{$q8_Tp~S~+(8Uz3fots3tlpG%TG;N*|f{tP9$pUe_|FGOa1EMHE)$EY1qo2 zM~zuSriAoLQq?>D;U*6xV@51`xQ{?h>62(~Iw&i25viMt z35T=xprIH+q+Dx{vvTszDTbQNP7~3woutI3nK0@HfKK;(P`kPv_|{B!Uq|IvHo`eG zVWlYJ$tM`qC*zRHc{;cXtIvd1mQu;7gVUsYY}aS8Gdmpgy+^Cp&Dno9pXcHrOKOgiJ6a<|=li94b1)`VDmd+B3D zNp7f%fCn#AZNNAgd4tC?m!0w$%8Zuo^(tJ9ir|;oUrV&U9DRiL-cWWS&hfn+a*pZG z{enPnGO`h^W27juBAC}%&>Nn3p3d4n&N*1zWxP1U>_x~+IqKGid3QJ~KN%j!fiGPw zVnLsYiS<6-L|<660xbkGFH7-&k;iRWg5a?{7R-(&0t;B9wBYCBZO69m3!~%do)@cBmn)Ige z9^K5Fd1@V!JZ&*!Fqk0X(q~Z{Xz76d&oDps|e-7ZgS^&;ZxhGi=|

pdA)o;+j?$i4r~rhp-NXP0bexzW)&7uem0%HP zogz9;?@P(oh}Sg$FbH{eX}R;ov?biRNsZUKVT8HlT|anPQ0&PhGoU&8gSJ*b`RL(= zYMJ(BntCwqx{QuV)|W8b?gC#c$KB!@a63@h!Rm^$Xoh1>+;RS=vn9dm!z)tFy&}+# zKwGvhZ)_JSJbvKJV+o# z-!_H$dB3ayfCr~ym3#N@Xg9ZA5Jcht=`uR5%+<9_rkVSWuh1X(*svsYQ>5-n zo0NB_QN7IiUId)7-(wgraa99V`8ea0a=*1At*+agvEAswbe`q$*dJaT4I%YJV2rjO zK1`}f0((^#%DR+UxYA-e-xW3Wv(uW;6aYMV9)kXw6s;=jqs18QNC$yFdMU$cYVL8h zjot=y2@P zg(`R9PM!1vcm0pW`QPb6cR+Y{HR)|?JhgaB!|uL0qI|6T{CutlhN?TO{XQc{HVr~* zs|)Y9X>Y!{!6aJ0#CF^6T=%}*_4exEzhTSMr>`pQpGn@ z!Nv78_3y6y)-PEG^ydU<(xKcW2=&S`<`tIgj*g^q)?jOIv{UJ!IdT9{G>f8CWkX0- z%e)N}n8Tf_U9X#Ly^E`yB6grM%qUdeh63m(h(;zZF7aeuaLkkb=yHmAr)L+AUT3{@ z=}zByG~DFl4gL1{TzAg$2VF@nff7ERt1*>kQZTzX=e=kjN=NQv;F6QKw>^x9{@oJK zA6{epkL7oEix#)u@p>l@Ye$W%u&~nSSS);`#0=}WcVd4ADI*Sf8VL3TtSTv{fk6R@ z0e1cp10&G25vs@qcG`itWQ7)}fV>)0>33dQ0R$?8(a0^yaaM#As)d%Prr}&WKx0@9 z_I>~T!K?50<@I6PSNnNStjSRq#3VVvoO8#`a&j2b24d*I;n@5P)u)tZ=rs3davayL zL01$(b=2_XHJYmBzjF?+(+4a@s6`_$PODR@I48Djw-IU?OeQuAQhf?fQKuFGr5&UkV&c?kp!c^O5M~%r+zh zTr8jO{+YO^)7|Gjf*FujKob%zIp}BBVbrSelect the variant copy, press right-click, and select the menu option Restore variant (will show if the main component still exists). +

Toggle for boolean variants

+

When a variant property represents a boolean state, Penpot can display it as a toggle instead of a dropdown. This offers a quicker and more visual way to switch between two opposite values when working with copies.

+

The toggle appears in place of the property values dropdown, only when a copy is selected.

+
+ Boolean variant option +
+

Accepted value pairs

+

For Penpot to recognize the property as a boolean and display the toggle, the property must be defined with exactly two opposing values. These can be any of the following pairs:

+
    +
  • true / false
    • +
  • on / off
    • +
  • yes / no
    • +
+

The order of the values does not matter. Penpot automatically maps them to ON and OFF states:

+
    +
  • ON state: true, yes, on
    • +
  • OFF state: false, no, off
    • +
+

Use variants

Once you have created your variants, you can place a copy of a component with variants into your design and then switch between its different versions.

From 52dd9271a94f516e675184ba1981ff422474daf8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Nov 2025 19:26:29 +0100 Subject: [PATCH 14/20] :bug: Encode header values as strings on audit archive task --- backend/src/app/loggers/audit/archive_task.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/loggers/audit/archive_task.clj b/backend/src/app/loggers/audit/archive_task.clj index c8aa0e0de9..4eb87d595e 100644 --- a/backend/src/app/loggers/audit/archive_task.clj +++ b/backend/src/app/loggers/audit/archive_task.clj @@ -57,7 +57,7 @@ :uid uuid/zero}) body (t/encode {:events events}) headers {"content-type" "application/transit+json" - "origin" (cf/get :public-uri) + "origin" (str (cf/get :public-uri)) "cookie" (u/map->query-string {:auth-token token})} params {:uri uri :timeout 12000 From 04274e53fa8cefaf77678a72538de55cb3981de9 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Nov 2025 10:45:48 +0100 Subject: [PATCH 15/20] :paperclip: Fix advanced compilation warnings related to jsdoc --- frontend/src/app/util/clipboard.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/util/clipboard.js b/frontend/src/app/util/clipboard.js index 96f4080a7e..0322829e41 100644 --- a/frontend/src/app/util/clipboard.js +++ b/frontend/src/app/util/clipboard.js @@ -67,15 +67,17 @@ function filterAllowedTypes(options) { * @param {string} type * @returns {boolean} */ - return function filter(type) { + function filter(type) { if ( (!("allowHTMLPaste" in options) || !options["allowHTMLPaste"]) && - type === "text/html" + type === "text/html" ) { return false; } return allowedTypes.includes(type); }; + + return filter; } /** @@ -85,19 +87,22 @@ function filterAllowedTypes(options) { * @returns {Function} */ function filterAllowedItems(options) { + /** * @param {DataTransferItem} * @returns {boolean} */ - return function filter(item) { + function filter(item) { if ( (!("allowHTMLPaste" in options) || !options["allowHTMLPaste"]) && - item.type === "text/html" + item.type === "text/html" ) { return false; } return allowedTypes.includes(item.type); }; + + return filter; } /** From eabf6e36edb4231a4a25e1c709e7d27a6859cd14 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Nov 2025 11:16:14 +0100 Subject: [PATCH 16/20] :sparkles: Remove a level of indentation on subscriptions-dashboard tests --- .../ui/specs/subscriptions-dashboard.spec.js | 756 +++++++++--------- 1 file changed, 376 insertions(+), 380 deletions(-) diff --git a/frontend/playwright/ui/specs/subscriptions-dashboard.spec.js b/frontend/playwright/ui/specs/subscriptions-dashboard.spec.js index 7945d87cb4..15f312bbd5 100644 --- a/frontend/playwright/ui/specs/subscriptions-dashboard.spec.js +++ b/frontend/playwright/ui/specs/subscriptions-dashboard.spec.js @@ -9,403 +9,399 @@ test.beforeEach(async ({ page }) => { ]); }); -test.describe("Subscriptions: dashboard", () => { - test("Team with unlimited subscription has specific icon in menu", async ({ +test("Team with unlimited subscription has specific icon in menu", async ({ + page, +}) => { + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-subscription.json", - ); + "get-profile", + "subscription/get-profile-unlimited-subscription.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await DashboardPage.mockRPC( - page, - "get-projects?team-id=*", - "dashboard/get-projects-second-team.json", - ); - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - await dashboardPage.goToSecondTeamDashboard(); - await expect(page.getByTestId("subscription-icon")).toBeVisible(); - }); - - test("The Unlimited subscription has its name in the sidebar dropdown", async ({ + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-subscription.json", - ); + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage-one-editor.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - await dashboardPage.goToDashboard(); - - await expect(page.getByTestId("subscription-name")).toHaveText( - "Unlimited plan (trial)", - ); - }); - - test("When the subscription status is unpaid, the sidebar dropdown displays the name Professional for the Unlimited subscription", async ({ + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-unpaid-subscription.json", - ); + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - await dashboardPage.goToDashboard(); - - await expect(page.getByTestId("subscription-name")).toHaveText( - "Professional plan", - ); - }); - - test("When the subscription status is canceled, the sidebar dropdown displays the name Professional for the Enterprise subscription", async ({ + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-enterprise-canceled-subscription.json", - ); + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - await dashboardPage.goToDashboard(); - - await expect(page.getByTestId("subscription-name")).toHaveText( - "Professional plan", - ); - }); + await DashboardPage.mockRPC( + page, + "get-projects?team-id=*", + "dashboard/get-projects-second-team.json", + ); + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + await dashboardPage.goToSecondTeamDashboard(); + await expect(page.getByTestId("subscription-icon")).toBeVisible(); }); -test.describe("Subscriptions: team members and invitations", () => { - test("Team settings has susbscription name and no manage subscription link when is member", async ({ +test("The Unlimited subscription has its name in the sidebar dropdown", async ({ + page, +}) => { + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "logged-in-user/get-profile-logged-in.json", - ); + "get-profile", + "subscription/get-profile-unlimited-subscription.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-member.json", - ); - - await DashboardPage.mockRPC( - page, - "get-projects?team-id=*", - "dashboard/get-projects-second-team.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-members?team-id=*", - "subscription/get-team-members-subscription-member.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-stats?team-id=*", - "dashboard/get-team-stats.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - - await dashboardPage.goToSecondTeamSettingsSection(); - await expect(page.getByText("Unlimited (trial)")).toBeVisible(); - await expect( - page.getByRole("button", { name: "Manage your subscription" }), - ).not.toBeVisible(); - }); - - test("Team settings has susbscription name and manage subscription link when is owner", async ({ + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-subscription.json", - ); + "get-subscription-usage", + "subscription/get-subscription-usage-one-editor.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await DashboardPage.mockRPC( - page, - "get-projects?team-id=*", - "dashboard/get-projects-second-team.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-members?team-id=*", - "subscription/get-team-members-subscription-owner.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-stats?team-id=*", - "dashboard/get-team-stats.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - - await dashboardPage.goToSecondTeamSettingsSection(); - - await expect(page.getByText("Unlimited (trial)")).toBeVisible(); - await expect( - page.getByRole("button", { name: "Manage your subscription" }), - ).toBeVisible(); - }); - - test("Members tab has warning message when user has more seats than editors.", async ({ + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-subscription.json", - ); + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await DashboardPage.mockRPC( - page, - "get-projects?team-id=*", - "dashboard/get-projects-second-team.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-members?team-id=*", - "subscription/get-team-members-subscription-eight-member.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - - await dashboardPage.goToSecondTeamMembersSection(); - - const ctas = page.getByTestId("cta"); - await expect(ctas).toHaveCount(2); - await expect( - page.getByText("Inviting people while on the unlimited plan"), - ).toBeVisible(); - }); - - test("Invitations tab has warning message when user has more seats than editors.", async ({ + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( page, - }) => { - await DashboardPage.mockRPC( - page, - "get-profile", - "subscription/get-profile-unlimited-subscription.json", - ); + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); - await DashboardPage.mockRPC( - page, - "get-subscription-usage", - "subscription/get-subscription-usage.json", - ); + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + await dashboardPage.goToDashboard(); - await DashboardPage.mockRPC( - page, - "get-team-info", - "subscription/get-team-info-subscriptions.json", - ); - - const dashboardPage = new DashboardPage(page); - await dashboardPage.setupDashboardFull(); - await DashboardPage.mockRPC( - page, - "get-teams", - "subscription/get-teams-unlimited-subscription-owner.json", - ); - - await DashboardPage.mockRPC( - page, - "get-projects?team-id=*", - "dashboard/get-projects-second-team.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-members?team-id=*", - "subscription/get-team-members-subscription-eight-member.json", - ); - - await DashboardPage.mockRPC( - page, - "get-team-invitations?team-id=*", - "subscription/get-team-invitations.json", - ); - - await dashboardPage.mockRPC( - "push-audit-events", - "workspace/audit-event-empty.json", - ); - - await dashboardPage.goToSecondTeamInvitationsSection(); - - const ctas = page.getByTestId("cta"); - await expect(ctas).toHaveCount(2); - await expect( - page.getByText("Inviting people while on the unlimited plan"), - ).toBeVisible(); - }); + await expect(page.getByTestId("subscription-name")).toHaveText( + "Unlimited plan (trial)", + ); +}); + +test("The sidebar dropdown displays the correct subscription name when status is Unpaid", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "subscription/get-profile-unlimited-unpaid-subscription.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + await dashboardPage.goToDashboard(); + + await expect(page.getByTestId("subscription-name")).toHaveText( + "Professional plan", + ); +}); + +test("The sidebar dropdown displays the correct subscription name when status is cancelled", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "subscription/get-profile-enterprise-canceled-subscription.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + await dashboardPage.goToDashboard(); + + await expect(page.getByTestId("subscription-name")).toHaveText( + "Professional plan", + ); +}); + +test("Team settings has susbscription name and no manage subscription link when is member", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "logged-in-user/get-profile-logged-in.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-member.json", + ); + + await DashboardPage.mockRPC( + page, + "get-projects?team-id=*", + "dashboard/get-projects-second-team.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-members?team-id=*", + "subscription/get-team-members-subscription-member.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-stats?team-id=*", + "dashboard/get-team-stats.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + + await dashboardPage.goToSecondTeamSettingsSection(); + await expect(page.getByText("Unlimited (trial)")).toBeVisible(); + await expect( + page.getByRole("button", { name: "Manage your subscription" }), + ).not.toBeVisible(); +}); + +test("Team settings has susbscription name and manage subscription link when is owner", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "subscription/get-profile-unlimited-subscription.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); + + await DashboardPage.mockRPC( + page, + "get-projects?team-id=*", + "dashboard/get-projects-second-team.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-members?team-id=*", + "subscription/get-team-members-subscription-owner.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-stats?team-id=*", + "dashboard/get-team-stats.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + + await dashboardPage.goToSecondTeamSettingsSection(); + + await expect(page.getByText("Unlimited (trial)")).toBeVisible(); + await expect( + page.getByRole("button", { name: "Manage your subscription" }), + ).toBeVisible(); +}); + +test("Members tab has warning message when user has more seats than editors", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "subscription/get-profile-unlimited-subscription.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); + + await DashboardPage.mockRPC( + page, + "get-projects?team-id=*", + "dashboard/get-projects-second-team.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-members?team-id=*", + "subscription/get-team-members-subscription-eight-member.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + + await dashboardPage.goToSecondTeamMembersSection(); + + const ctas = page.getByTestId("cta"); + await expect(ctas).toHaveCount(2); + await expect( + page.getByText("Inviting people while on the unlimited plan"), + ).toBeVisible(); +}); + +test("Invitations tab has warning message when user has more seats than editors", async ({ + page, +}) => { + await DashboardPage.mockRPC( + page, + "get-profile", + "subscription/get-profile-unlimited-subscription.json", + ); + + await DashboardPage.mockRPC( + page, + "get-subscription-usage", + "subscription/get-subscription-usage.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-info", + "subscription/get-team-info-subscriptions.json", + ); + + const dashboardPage = new DashboardPage(page); + await dashboardPage.setupDashboardFull(); + await DashboardPage.mockRPC( + page, + "get-teams", + "subscription/get-teams-unlimited-subscription-owner.json", + ); + + await DashboardPage.mockRPC( + page, + "get-projects?team-id=*", + "dashboard/get-projects-second-team.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-members?team-id=*", + "subscription/get-team-members-subscription-eight-member.json", + ); + + await DashboardPage.mockRPC( + page, + "get-team-invitations?team-id=*", + "subscription/get-team-invitations.json", + ); + + await dashboardPage.mockRPC( + "push-audit-events", + "workspace/audit-event-empty.json", + ); + + await dashboardPage.goToSecondTeamInvitationsSection(); + + const ctas = page.getByTestId("cta"); + await expect(ctas).toHaveCount(2); + await expect( + page.getByText("Inviting people while on the unlimited plan"), + ).toBeVisible(); }); From 6061391c89b71718fe783b67fc75f353c2782d55 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Nov 2025 12:12:11 +0100 Subject: [PATCH 17/20] :sparkles: Don't require cljs.analyzer api under cljs on data.macros Reduces the final production bundle size --- common/src/app/common/data/macros.cljc | 71 +++++++++++++------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/common/src/app/common/data/macros.cljc b/common/src/app/common/data/macros.cljc index e0096b21cc..dc23426a95 100644 --- a/common/src/app/common/data/macros.cljc +++ b/common/src/app/common/data/macros.cljc @@ -9,10 +9,10 @@ (:refer-clojure :exclude [get-in select-keys str with-open max]) #?(:cljs (:require-macros [app.common.data.macros])) (:require + #?(:clj [cljs.analyzer.api :as aapi]) #?(:clj [clojure.core :as c] :cljs [cljs.core :as c]) [app.common.data :as d] - [cljs.analyzer.api :as aapi] [cuerdas.core :as str])) (defmacro select-keys @@ -44,42 +44,43 @@ [& params] `(str/concat ~@params)) -(defmacro export - "A helper macro that allows reexport a var in a current namespace." - [v] - (if (boolean (:ns &env)) +#?(:clj + (defmacro export + "A helper macro that allows reexport a var in a current namespace." + [v] + (if (boolean (:ns &env)) - ;; Code for ClojureScript - (let [mdata (aapi/resolve &env v) - arglists (second (get-in mdata [:meta :arglists])) - sym (symbol (c/name v)) - andsym (symbol "&") - procarg #(if (= % andsym) % (gensym "param"))] - (if (pos? (count arglists)) - `(def - ~(with-meta sym (:meta mdata)) - (fn ~@(for [args arglists] - (let [args (map procarg args)] - (if (some #(= andsym %) args) - (let [[sargs dargs] (split-with #(not= andsym %) args)] - `([~@sargs ~@dargs] (apply ~v ~@sargs ~@(rest dargs)))) - `([~@args] (~v ~@args))))))) - `(def ~(with-meta sym (:meta mdata)) ~v))) + ;; Code for ClojureScript + (let [mdata (aapi/resolve &env v) + arglists (second (get-in mdata [:meta :arglists])) + sym (symbol (c/name v)) + andsym (symbol "&") + procarg #(if (= % andsym) % (gensym "param"))] + (if (pos? (count arglists)) + `(def + ~(with-meta sym (:meta mdata)) + (fn ~@(for [args arglists] + (let [args (map procarg args)] + (if (some #(= andsym %) args) + (let [[sargs dargs] (split-with #(not= andsym %) args)] + `([~@sargs ~@dargs] (apply ~v ~@sargs ~@(rest dargs)))) + `([~@args] (~v ~@args))))))) + `(def ~(with-meta sym (:meta mdata)) ~v))) - ;; Code for Clojure - (let [vr (resolve v) - m (meta vr) - n (:name m) - n (with-meta n - (cond-> {} - (:dynamic m) (assoc :dynamic true) - (:protocol m) (assoc :protocol (:protocol m))))] - `(let [m# (meta ~vr)] - (def ~n (deref ~vr)) - (alter-meta! (var ~n) merge (dissoc m# :name)) - ;; (when (:macro m#) - ;; (.setMacro (var ~n))) - ~vr)))) + ;; Code for Clojure + (let [vr (resolve v) + m (meta vr) + n (:name m) + n (with-meta n + (cond-> {} + (:dynamic m) (assoc :dynamic true) + (:protocol m) (assoc :protocol (:protocol m))))] + `(let [m# (meta ~vr)] + (def ~n (deref ~vr)) + (alter-meta! (var ~n) merge (dissoc m# :name)) + ;; (when (:macro m#) + ;; (.setMacro (var ~n))) + ~vr))))) (defmacro fmt "String interpolation helper. Can only be used with strings known at From 9998ce0bb4ea9b512b86b1859bf853377aaafe80 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Nov 2025 13:03:51 +0100 Subject: [PATCH 18/20] :fire: Remove fipps direct dependency --- common/deps.edn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/common/deps.edn b/common/deps.edn index dcdf4fe0a8..7c3e860e21 100644 --- a/common/deps.edn +++ b/common/deps.edn @@ -48,12 +48,8 @@ com.sun.mail/jakarta.mail {:mvn/version "2.0.2"} org.la4j/la4j {:mvn/version "0.6.0"} - ;; exception printing - fipp/fipp {:mvn/version "0.6.29"} - me.flowthing/pp {:mvn/version "2024-11-13.77"} - io.aviso/pretty {:mvn/version "1.4.4"} environ/environ {:mvn/version "1.2.0"}} :paths ["src" "vendor" "target/classes"] From fcbe9d92dc29559b2641458a9b9ee9e7605c46b2 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 27 Nov 2025 14:38:21 +0100 Subject: [PATCH 19/20] :bug: Fix unexpected exception on rendering feedback email Looks like a bug on selmer library --- backend/resources/app/email/feedback/en.txt | 3 ++- backend/src/app/util/template.clj | 2 +- common/deps.edn | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/resources/app/email/feedback/en.txt b/backend/resources/app/email/feedback/en.txt index 76a42e42cf..7427ef0de0 100644 --- a/backend/resources/app/email/feedback/en.txt +++ b/backend/resources/app/email/feedback/en.txt @@ -1,7 +1,8 @@ From: {{profile.fullname}} <{{profile.email}}> / {{profile.id}} Subject: {{feedback-subject}} Type: {{feedback-type}} -{%- if feedback-error-href %} + +{% if feedback-error-href %} HREF: {{feedback-error-href}} {% endif -%} diff --git a/backend/src/app/util/template.clj b/backend/src/app/util/template.clj index b781fc194a..5c7a0b8c6e 100644 --- a/backend/src/app/util/template.clj +++ b/backend/src/app/util/template.clj @@ -9,7 +9,7 @@ [app.common.exceptions :as ex] [selmer.parser :as sp])) -(sp/cache-off!) +;; (sp/cache-off!) (defn render [path context] diff --git a/common/deps.edn b/common/deps.edn index 7c3e860e21..a2d9a1b1ec 100644 --- a/common/deps.edn +++ b/common/deps.edn @@ -17,7 +17,7 @@ org.slf4j/slf4j-api {:mvn/version "2.0.17"} pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.40"} - selmer/selmer {:mvn/version "1.12.62"} + selmer/selmer {:mvn/version "1.12.69"} criterium/criterium {:mvn/version "0.4.6"} metosin/jsonista {:mvn/version "0.3.13"} From db1ab7be698572056ad0d7fc28b22c95f9649112 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 27 Nov 2025 14:39:13 +0100 Subject: [PATCH 20/20] :paperclip: Run worker bundling serially on devenv --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 6eb48efa4a..9ac5975668 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -47,7 +47,7 @@ "watch:app:libs": "node ./scripts/build-libs.js --watch", "watch:app:main": "clojure -M:dev:shadow-cljs watch main storybook", "clear:shadow-cache": "rm -rf .shadow-cljs", - "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run build:app:worker\" \"yarn run watch:app:main\" \"yarn run watch:app:libs\"", + "watch:app": "yarn run clear:shadow-cache && yarn run build:app:worker && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"", "watch": "yarn run watch:app:assets", "watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"", "watch:storybook:assets": "node ./scripts/watch-storybook.js"