Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(permission): range selector blur (#4310)
Gpound.liu92c757742e26
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsxindex 0c223cfc44..d1a66274a1 100644--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx@@ -34,10 +34,11 @@ interface IPermissionDetailMainPartProps {desc?: string;onDescChange: (desc: string) => void;rangeSelectorRef: React.MutableRefObject<any>;+ onFocus: () => void;}export const PermissionDetailMainPart = (props: IPermissionDetailMainPartProps) => {- const { ranges, onRangesChange, rangeSelectorRef, desc, onDescChange, rangesErrMsg, isFocusRangeSelector, permissionId } = props;+ const { ranges, onRangesChange, rangeSelectorRef, desc, onDescChange, rangesErrMsg, isFocusRangeSelector, permissionId, onFocus } = props;const componentManager = useDependency(ComponentManager);const RangeSelector = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []);const univerInstanceService = useDependency(IUniverInstanceService);@@ -85,6 +86,7 @@ export const PermissionDetailMainPart = (props: IPermissionDetailMainPartProps)subUnitId={subUnitId}initValue={ranges?.map((i) => serializeRange(i)).join(',')}onChange={handleRangeChange}+ onFocus={onFocus}isFocus={isFocusRangeSelector}actions={rangeSelectorRef.current}/>diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsxindex 57752048f3..513e825849 100644--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx@@ -18,7 +18,7 @@ import type { IRange, Workbook } from '@univerjs/core';import type { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';import { Injector, IUniverInstanceService, UniverInstanceType, useDependency } from '@univerjs/core';import { EditStateEnum, ViewStateEnum } from '@univerjs/sheets';-import { ComponentContainer, ISidebarService, useComponentsOfPart } from '@univerjs/ui';+import { ComponentContainer, ISidebarService, useComponentsOfPart, useSidebarClick } from '@univerjs/ui';import React, { useEffect, useRef, useState } from 'react';import { UNIVER_SHEET_PERMISSION_USER_PART } from '../../../consts/permission';import { checkRangeValid, generateDefaultRule, generateRuleByUnitType } from '../util';@@ -47,10 +47,10 @@ export const SheetPermissionPanelDetail = (props: ISheetPermissionPanelDetailProconst rangeSelectorActionsRef = useRef<any>({});const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);- const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {+ useSidebarClick((e: MouseEvent) => {const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;- handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);- };+ handleOutClick && handleOutClick(e, () => isFocusRangeSelectorSet(false));+ });const PermissionDetailUserPart = useComponentsOfPart(UNIVER_SHEET_PERMISSION_USER_PART);@@ -71,8 +71,9 @@ export const SheetPermissionPanelDetail = (props: ISheetPermissionPanelDetailPro}, []);return (- <div className={styles.permissionPanelDetailWrapper} onClick={handlePanelClick}>+ <div className={styles.permissionPanelDetailWrapper}><PermissionDetailMainPart+ onFocus={() => isFocusRangeSelectorSet(true)}permissionId={activeRule.permissionId}ranges={ranges}onRangesChange={(v: IRange[], err?: string) => {