Skip to content

Commit 0374e4f

Browse files
committed
Merge remote-tracking branch 'origin/staging' into develop
2 parents 528c819 + 6d21fcc commit 0374e4f

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

.github/workflows/build-bundles.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
# zip_mode defines how the build artifacts are packaged:
1616
# - 'individual': creates one ZIP file per component (frontend, backend, exporter)
1717
# - 'all': creates a single ZIP containing all components
18+
# - null: for the rest of cases (non-manual events)
1819
description: 'Bundle packaging mode'
1920
required: false
2021
default: 'individual'
@@ -62,8 +63,8 @@ jobs:
6263
echo "📦 Packaging Penpot 'all' bundles..."
6364
zip -r zips/penpot-all-bundles.zip penpot
6465
65-
- name: Create zip bundles for zip_mode == 'individual'
66-
if: ${{ github.event.inputs.zip_mode == 'individual' }}
66+
- name: Create zip bundles for zip_mode != 'all'
67+
if: ${{ github.event.inputs.zip_mode != 'all' }}
6768
run: |
6869
echo "📦 Packaging Penpot 'individual' bundles..."
6970
zip -r zips/penpot-frontend.zip penpot/frontend
@@ -78,7 +79,7 @@ jobs:
7879
path: zips/penpot-all-bundles.zip
7980

8081
- name: Upload individual bundles
81-
if: ${{ github.event.inputs.zip_mode == 'individual' }}
82+
if: ${{ github.event.inputs.zip_mode != 'all' }}
8283
uses: actions/upload-artifact@v4
8384
with:
8485
name: penpot-individual-bundles
@@ -94,7 +95,7 @@ jobs:
9495
aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.commit_hash }}.zip
9596
9697
- name: Upload 'individual' bundles to S3
97-
if: ${{ github.event.inputs.zip_mode == 'individual' }}
98+
if: ${{ github.event.inputs.zip_mode != 'all' }}
9899
run: |
99100
for name in penpot-frontend penpot-backend penpot-exporter; do
100101
aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.gh_branch }}-latest.zip

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ on-premises instances** that want to keep up to date.
5959
- Update google fonts (at 2025/05/19) [Taiga 10792](https://tree.taiga.io/project/penpot/us/10792)
6060
- Add tooltip component to DS [Taiga 9220](https://tree.taiga.io/project/penpot/us/9220)
6161
- Allow multi file token export [Taiga #10144](https://tree.taiga.io/project/penpot/us/10144)
62+
- Fix problem when double click on hidden shapes [Taiga #11314](https://tree.taiga.io/project/penpot/issue/11314)
6263

6364
### :bug: Bugs fixed
6465

common/src/app/common/types/path.cljc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,17 @@
200200
contents
201201
(sequence extract-content-xf (:shapes shape))]
202202

203-
(bool/calculate-content (:bool-type shape) contents)))
203+
(ex/try!
204+
(bool/calculate-content (:bool-type shape) contents)
205+
206+
:on-exception
207+
(fn [cause]
208+
(ex/raise :type :internal
209+
:code :invalid-path-content
210+
:hint (str "unable to calculate bool content for shape " (:id shape))
211+
:shapes (:shapes shape)
212+
:content (mapv str contents)
213+
:cause cause)))))
204214

205215
(defn calc-bool-content
206216
"Calculate the boolean content from shape and objects. Returns a

frontend/src/app/main/ui/workspace/viewport/hooks.cljs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@
286286
(fn [mod? ids]
287287
(let [sorted-ids
288288
(into (d/ordered-set)
289-
(comp (remove #(dm/get-in objects [% :blocked]))
289+
(comp (remove (partial cfh/hidden-parent? objects))
290+
(remove #(dm/get-in objects [% :blocked]))
290291
(remove (partial cfh/svg-raw-shape? objects)))
291292
(ctt/sort-z-index objects ids {:bottom-frames? mod?}))]
292293
(mf/set-ref-val! sorted-ids-cache (assoc cached-ids [mod? ids] sorted-ids))
@@ -355,7 +356,6 @@
355356
hover-shape
356357
(->> ids
357358
(remove remove-hover?)
358-
(remove (partial cfh/hidden-parent? objects))
359359
(remove #(and mod? (no-fill-nested-frames? %)))
360360
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
361361
(first)
@@ -366,7 +366,6 @@
366366
(when show-measures?
367367
(->> ids
368368
(remove remove-measure?)
369-
(remove (partial cfh/hidden-parent? objects))
370369
(remove #(and mod? (no-fill-nested-frames? %)))
371370
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
372371
(first)

0 commit comments

Comments
 (0)