Skip to content

fix(Block Props): improved implementation of getPropValue (backport #525)#539

Merged
surajshetty3416 merged 4 commits intomasterfrom
mergify/bp/master/pr-525
Mar 31, 2026
Merged

fix(Block Props): improved implementation of getPropValue (backport #525)#539
surajshetty3416 merged 4 commits intomasterfrom
mergify/bp/master/pr-525

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 31, 2026

Previously dynamic props which came from other props (not Block Data Script or Page Script) were not resolved properly.

Also, now with blockUidStore, we no more need to pass getDataScriptValue, getBlockDataScriptValue, defaultProps to getPropValue, it can infer those automatically.

getParentProp now provides traceback as to which props come from which parent (grandparent) blocks.

Misc fixes:

  • allResolvedProps would behave unexpectedly if resolved before the BuilderBlock was mounted, fixed that along with the new implementation of getPropValue
  • somehow we deleted the opposite of what was required (BuilderBlock.vue - Line 182)
  • using separate watchEffects for the three properties, keeping all in one sometimes caused loops.
    This is an automatic backport of pull request fix(Block Props): improved implementation of getPropValue #525 done by Mergify.

stravo1 added 3 commits March 31, 2026 03:41
@stravo1 @mergify
fix: simplify getPropValue with dynamic props handling
cdcb7f5 
now props which are dynamic and comesFrom props are also handled

(cherry picked from commit fcc5ba5)

# Conflicts:
#	frontend/src/components/Controls/CodeMirror/CodeMirrorEditor.vue
@stravo1 @mergify
fix: reorder props merging in computed properties
d618aac 
(cherry picked from commit 23fea23)
@stravo1 @mergify
fix: correct attribute filtering and enhance data watching in Builder…
8f90a9b 
…Block

(cherry picked from commit ad716a7)
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 31, 2026

Cherry-pick of fcc5ba5 has failed:

On branch mergify/bp/master/pr-525
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit fcc5ba5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/BlockHTML.vue
	modified:   frontend/src/components/BuilderBlock.vue
	modified:   frontend/src/components/Controls/DynamicValueHandler.vue
	modified:   frontend/src/components/TextBlock.vue
	modified:   frontend/src/utils/helpers.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Controls/CodeMirror/CodeMirrorEditor.vue

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Mar 31, 2026
@mergify mergify bot mentioned this pull request Mar 31, 2026
Merged
@surajshetty3416 surajshetty3416 merged commit 191d0ac into master Mar 31, 2026
7 checks passed
@surajshetty3416 surajshetty3416 deleted the mergify/bp/master/pr-525 branch March 31, 2026 03:48
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 31, 2026

🎉 This PR is included in version 1.23.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 31, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.49%. Comparing base (2454bcf) to head (eb4dd08).
⚠️ Report is 7 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master     #539   +/-   ##
=======================================
  Coverage   63.49%   63.49%           
=======================================
  Files          27       27           
  Lines        2802     2802           
=======================================
  Hits         1779     1779           
  Misses       1023     1023

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@surajshetty3416 surajshetty3416 surajshetty3416 approved these changes

Assignees

No one assigned

Labels

conflicts released

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@surajshetty3416 @stravo1