-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ISSUE #5198 - plain text works, but callout is not immidiately shaped
- Loading branch information
1 parent
debb9b2
commit a85dba9
Showing
6 changed files
with
174 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
...s/components/screenshotDialog/components/typingHandler/typingCalloutHandler.component.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /** | ||
| * Copyright (C) 2024 3D Repo Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| import { useState, useEffect, CSSProperties } from 'react'; | ||
| import Konva from 'konva'; | ||
| import { isEmpty } from 'lodash'; | ||
| import { EditableText } from '../editableText/editableText.component'; | ||
|
|
||
| interface IProps { | ||
| stage: Konva.Stage; | ||
| layer: Konva.Layer; | ||
| boxRef?: any; | ||
| fontSize: number; | ||
| size?: number; | ||
| color: string; | ||
| onRefreshDrawingLayer?: () => void; | ||
| onAddNewText: (position, text: string, width: number, updateState?: boolean) => void; | ||
| } | ||
|
|
||
| export const TypingCalloutHandler = ({ | ||
| stage, layer, boxRef, fontSize, size, color, onRefreshDrawingLayer, onAddNewText | ||
| }: IProps) => { | ||
| const [isPositionLocked, setIsPositionLocked] = useState(false); | ||
| const [offset, setOffset] = useState<CSSProperties>({}); | ||
| const [maxSizes, setMaxSizes] = useState({ maxWidth: 0, maxHeight: 0 }); | ||
|
|
||
| const setTextPosition = () => { | ||
| let left = 0, top = 0; | ||
| if (stage && layer) { | ||
| const position = stage.getPointerPosition(); | ||
| left = position.x - layer.x(); | ||
| top = position.y - layer.y(); | ||
| } | ||
| setOffset({ top, left }); | ||
| const { width, height } = stage.attrs; | ||
| setMaxSizes({ | ||
| maxWidth: width - left, | ||
| maxHeight: height - top, | ||
| }); | ||
| }; | ||
|
|
||
| const onTextChange = (newText: string, width: number) => { | ||
| onAddNewText({ x: offset.left, y: offset.top }, newText, width); | ||
| setIsPositionLocked(false); | ||
| }; | ||
|
|
||
| const redrawCalloutBox = ({ width, height }) => { | ||
| if (!isEmpty(boxRef) && onRefreshDrawingLayer) { | ||
| boxRef.width(width + Math.max(6, size * 2)); | ||
| boxRef.height(height + Math.max(6, size * 2)); | ||
| onRefreshDrawingLayer(); | ||
| } | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| if (isPositionLocked) return; | ||
|
|
||
| const handleMouseMove = () => setTextPosition(); | ||
| const handleClick = () => setTimeout(() => setIsPositionLocked(true)); | ||
|
|
||
| stage.on('mousemove touchmove', handleMouseMove); | ||
| stage.on('click touchstart', handleClick); | ||
|
|
||
| return () => { | ||
| stage.off('mousemove touchmove', handleMouseMove); | ||
| stage.off('click touchstart', handleClick); | ||
| } | ||
| }, [isPositionLocked]); | ||
|
|
||
| useEffect(() => { | ||
| if (!isEmpty(boxRef) && !isEmpty(offset) && onRefreshDrawingLayer) { | ||
| boxRef.x(Number(offset.left) - Math.max(3, size)); | ||
| boxRef.y(Number(offset.top) - Math.max(3, size)); | ||
| onRefreshDrawingLayer(); | ||
| } | ||
| }, [offset]); | ||
|
|
||
| const styles = { | ||
| ...offset, | ||
| ...maxSizes, | ||
| color, | ||
| fontSize: `${fontSize}px`, | ||
| }; | ||
|
|
||
| if (!isPositionLocked) return <EditableText disabled styles={styles} onResize={redrawCalloutBox} />; | ||
|
|
||
| return ( | ||
| <EditableText | ||
| onAddText={onTextChange} | ||
| styles={styles} | ||
| onResize={redrawCalloutBox} | ||
| /> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters