Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sheet): freeze invalid #2658

Merged
merged 2 commits into from
Jul 2, 2024
Merged

fix(sheet): freeze invalid #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c066935
fix(sheet): freeze invalid
DR-Univer Jul 2, 2024
75751b2
fix(sheet): type error
DR-Univer Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/engine-render/src/components/sheets/column-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ export class SpreadsheetColumnHeader extends SpreadsheetHeader {

const segment = spreadsheetSkeleton.rowColumnSegment;

if (!segment) {
return;
}

if (segment.startColumn === -1 && segment.endColumn === -1) {
return;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/engine-render/src/components/sheets/row-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ export class SpreadsheetRowHeader extends SpreadsheetHeader {

const segment = spreadsheetSkeleton.rowColumnSegment;

if (!segment) {
return;
}

if (segment.startRow === -1 && segment.endRow === -1) {
return;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/engine-render/src/components/sheets/spreadsheet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,10 @@ export class Spreadsheet extends SheetComponent {

const segment = spreadsheetSkeleton.rowColumnSegment;

if (!segment) {
return;
}

if (
(segment.startRow === -1 && segment.endRow === -1) ||
(segment.startColumn === -1 && segment.endColumn === -1)
Expand Down
45 changes: 33 additions & 12 deletions packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM

private _freezeDownSubs: Nullable<Subscription>;

private _freezeMainPointerMoveSubs: Nullable<Subscription>;
private _freezePointerEnterSubs: Nullable<Subscription>;

private _freezeHeaderPointerLeaveSubs: Nullable<Subscription>;
private _freezePointerLeaveSubs: Nullable<Subscription>;

private _scenePointerMoveSub: Nullable<Subscription>;

Expand All @@ -141,8 +141,6 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
private _lastFreeze: IFreeze | undefined = undefined;

public interceptor = new InterceptorManager({ FREEZE_PERMISSION_CHECK });
private _freezeObjHeaderPointerLeaveSub: Subscription | undefined;
private _freezeObjHeaderPointerEnterSub: Subscription | undefined;

constructor(
private readonly _context: IRenderContext<Workbook>,
Expand Down Expand Up @@ -301,12 +299,12 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM

const { scene } = sheetObject;

this._freezeMainPointerMoveSubs = new Subscription();
this._freezeHeaderPointerLeaveSubs = new Subscription();
this._freezePointerEnterSubs = new Subscription();
this._freezePointerLeaveSubs = new Subscription();
this._freezeDownSubs = new Subscription();

if (freezeObjectMainRect) {
const _freezeObjHeaderPointerEnterSub = freezeObjectMainRect.onPointerEnter$.subscribeEvent(() => {
const _freezeObjectMainRectEnterSub = freezeObjectMainRect.onPointerEnter$.subscribeEvent(() => {
const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
if (!permissionCheck) {
return false;
Expand All @@ -317,18 +315,41 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
});
scene.setCursor(CURSOR_TYPE.GRAB);
});
this._freezeMainPointerMoveSubs.add(_freezeObjHeaderPointerEnterSub);
this._freezePointerEnterSubs.add(_freezeObjectMainRectEnterSub);

const _freezeObjectMainPointerLeaveSub = freezeObjectMainRect.onPointerLeave$.subscribeEvent(() => {
freezeObjectHeaderRect?.setProps({
fill: this._freezeNormalHeaderColor,
zIndex: 3,
});
scene.resetCursor();
});

this._freezePointerLeaveSubs.add(_freezeObjectMainPointerLeaveSub);
}

if (freezeObjectHeaderRect) {
const _freezeObjHeaderPointerEnterSub = freezeObjectHeaderRect.onPointerEnter$.subscribeEvent(() => {
const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
if (!permissionCheck) {
return false;
}
freezeObjectHeaderRect?.setProps({
fill: this._freezeHoverColor,
zIndex: 4,
});
scene.setCursor(CURSOR_TYPE.GRAB);
});
this._freezePointerEnterSubs.add(_freezeObjHeaderPointerEnterSub);

const _freezeObjHeaderPointerLeaveSub = freezeObjectHeaderRect.onPointerLeave$.subscribeEvent(() => {
freezeObjectHeaderRect?.setProps({
fill: this._freezeNormalHeaderColor,
zIndex: 3,
});
scene.resetCursor();
});
this._freezeHeaderPointerLeaveSubs.add(_freezeObjHeaderPointerLeaveSub);
this._freezePointerLeaveSubs.add(_freezeObjHeaderPointerLeaveSub);
}

const s1 = freezeObjectHeaderRect?.onPointerDown$.subscribeEvent((evt: IPointerEvent | IMouseEvent) => {
Expand Down Expand Up @@ -1479,12 +1500,12 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
return;
}

[this._freezeDownSubs, this._freezeMainPointerMoveSubs, this._freezeHeaderPointerLeaveSubs].forEach((s) => {
[this._freezeDownSubs, this._freezePointerEnterSubs, this._freezePointerLeaveSubs].forEach((s) => {
s?.unsubscribe();
});
this._freezeDownSubs = null;
this._freezeMainPointerMoveSubs = null;
this._freezeHeaderPointerLeaveSubs = null;
this._freezePointerEnterSubs = null;
this._freezePointerLeaveSubs = null;

// TODO @lumixraku
// in prev version, scene.onPointerEnterObserver.remove(this._moveObserver);
Expand Down
Loading