Skip to content

Merge latest master into v8-branch#1402

Merged
mathuo merged 6 commits into
v8-branchfrom
claude/v8-branch-master-merge-bpo9ym
Jul 5, 2026
Merged

Merge latest master into v8-branch#1402
mathuo merged 6 commits into
v8-branchfrom
claude/v8-branch-master-merge-bpo9ym

Conversation

@mathuo

@mathuo mathuo commented Jul 5, 2026

Copy link
Copy Markdown
Owner

Description

Merges the latest master (5 commits ahead of v8-branch) into v8-branch to keep the v8 line current.

Two conflicts arose, both the same pattern: v8-branch had already extracted inline logic into a shared method, while master made small cosmetic tweaks to the old inline code. Resolved by keeping the v8 refactor and porting master's improvements into the extracted methods so nothing from master is lost:

  • content.ts — kept the group.canDisplayContentOverlay(...) call; ported master's data && data.viewIddata?.viewId cosmetic change into canDisplayContentOverlay in dockviewGroupPanelModel.ts.
  • tabGroupIndicator.ts — kept the ensureSvgPath(...) call, which already embodies master's improved (inverted) SVG-reuse conditional.

All other master changes (removeChild.remove(), te?.value optional chaining, etc.) merged automatically.

Type of change

  • Refactor / cleanup
  • Build / CI / tooling

Affected packages

  • dockview-core
  • dockview-vue

How to test

This is a branch-sync merge; the incoming master commits were already reviewed and merged on their own. Verify the two conflict resolutions preserve behaviour: the drop-overlay check in content.ts still routes through canDisplayContentOverlay, and the tab-group underline still reuses its SVG via ensureSvgPath. Run yarn test in dockview-core once dependencies are installed.

Checklist

  • yarn lint:fix passes
  • yarn format passes
  • npm run gen has been run and generated files are up to date
  • yarn test passes
  • I have added or updated tests where applicable
  • Breaking changes are documented

🤖 Generated with Claude Code


Generated by Claude Code

claude and others added 6 commits July 3, 2026 19:17
Two MEDIUM reliability issues on new code were holding
`new_reliability_rating` at C on master:

- css:S8776 (_space-mixin.scss:30) "Missing scoping root" — the explicit
  `&` had no style-rule parent inside the @mixin. Drop it; a bare nested
  `.dv-dockview` compiles to the identical descendant selector (verified:
  compiled CSS is byte-identical) and matches the sibling selectors.
- typescript:S7737 (dockviewComponent.ts removePanel/_doRemovePanel) — object
  literal used as a parameter default. Make `options` optional and apply the
  `removeEmptyGroup` default in the body; `_doRemovePanel` (single caller)
  now takes required options. Behaviour is unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NiZ9eADKvMUzPp7JLa6cXy
fix: resolve new-code reliability issues failing the quality gate
Address low-risk, behaviour-preserving code smells:

- S7762: use childNode.remove() instead of parentNode.removeChild(childNode)
- S6582: prefer optional chaining over `a && a.b` guards

Skipped the S7747 (unnecessary Array.from) reports: each `[...collection]`
is a deliberate defensive copy because the loop body mutates the collection
being iterated. Also left the CRITICAL/BLOCKER buckets untouched.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01B6tAi449PHv5hbMSyhtxMk
…7735)

The optional-chaining rewrite left an if/else with a negated condition.
Flip to the positive `=== 'svg'` form and swap the branches so both
S6582 (optional chaining) and S7735 (no negated condition) are satisfied.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01B6tAi449PHv5hbMSyhtxMk
chore: resolve safe SonarCloud maintainability issues (S6582, S7762)
…ster-merge-bpo9ym

# Conflicts:
#	packages/dockview-core/src/dockview/components/panel/content.ts
#	packages/dockview-core/src/dockview/components/titlebar/tabGroupIndicator.ts
@sonarqubecloud

sonarqubecloud Bot commented Jul 5, 2026

Copy link
Copy Markdown

@mathuo mathuo merged commit d0552d1 into v8-branch Jul 5, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants