Skip to content

Commit

Permalink
chore: Enable panOnScroll in branching inspector
Browse files Browse the repository at this point in the history
Change-Id: If882ff4cee48350cc793f9cdff77ac75a53932cc
GitOrigin-RevId: 828f205bfcc77f2c4e9b799109747c5a7d3d2940
  • Loading branch information
FMota0 authored and Copybara committed Aug 12, 2024
1 parent 1d85036 commit 1494b33
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@ export function AdminBranchingInspector() {
onNodeClick={(e, node) => {
setSelectedPkgVersionId(node.id);
}}
panOnScroll
selectionOnDrag
>
<LazyControls />
<LazyBackground gap={12} size={1} />
Expand Down
6 changes: 3 additions & 3 deletions platform/wab/src/wab/shared/site-diffs/merge-core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1797,14 +1797,14 @@ function runMergeFnAndApplyFixes(
iidsToBeDeleted.has(bundler.addrOf(inst).iid);

// Some operations can be harder to execute once we merge the elements in a single site, which
// we will process the before the merge, by directly changing `a` and `b` sites and then after
// merging we will have a simpler handling
// we will process before the merge, by directly changing a and b sites. This
// will make merging have a simpler handling
//
// It's possible to identify some cases by looking into `customRenameFn` in model-conflicts-meta.ts.
//
// An example of this case is the renaming a component.param referent to a state/variable, as those
// elements can be referred by expr instances which only have the name, it's necessary to update
// the expr instances to refer to the new name instead of the old one, if we merge the sites first
// the expr instances to refer to the new name instead of the old one. If we merge the sites first
// we may end up with duplicated names and it won't be clear which one requires being renamed.
autoReconciliations.push(...preFixNames(a, b, bundler, isDeletedInst));

Expand Down

0 comments on commit 1494b33

Please sign in to comment.