186143109 drawing toolbar in new toolbar system #2309
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import React, { PropsWithChildren, useRef } from "react"; | ||
| import { TileToolbarButton } from "./tile-toolbar-button"; | ||
|
|
||
| export interface IUploadButtonComponentProps { | ||
| name: string; // a unique internal name used in configuration to identify the button | ||
| title: string; // user-visible name, used in the tooltip | ||
| keyHint?: string, // If set, displayed to the user as the hotkey equivalent | ||
| accept?: string, // MIME types accepted | ||
| onUpload: (file: File) => void; // Action when a file is uploaded | ||
| selected?: boolean; // puts button in 'active' state if defined and true | ||
| disabled?: boolean; // makes button grey and unclickable if defined and true | ||
| } | ||
|
|
||
| /** | ||
| * A TileToolbarButton that is for uploading files. | ||
| * It contains a hidden input element, and the toolbar button forwards a click to it. | ||
| */ | ||
| export const UploadButton = | ||
| function({name, title, keyHint, accept, onUpload, selected, disabled, children}: | ||
| PropsWithChildren<IUploadButtonComponentProps>) { | ||
| const inputRef = useRef<HTMLInputElement>(null); | ||
|
|
||
| // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file | ||
| // Hide the <input> element — we do this because file inputs tend to be ugly, difficult | ||
| // to style, and inconsistent in their design across browsers. Opacity is used to hide the file | ||
| // input instead of visibility: hidden or display: none, because assistive technology interprets | ||
| // the latter two styles to mean the file input isn't interactive. | ||
| const hideFileInputStyle = { opacity: 0, width: 1, height: 1, maxWidth: 1, maxHeight: 1 }; | ||
|
|
||
| const handleFileInputChange = (e: React.ChangeEvent<HTMLInputElement>) => { | ||
| const files = e.currentTarget.files; | ||
| if (files?.length) { | ||
| onUpload(files[0]); | ||
| } | ||
| }; | ||
|
|
||
| const input = | ||
| <input | ||
| ref={inputRef} | ||
| type="file" | ||
| style={hideFileInputStyle} | ||
| accept={accept || "image/png, image/jpeg"} | ||
| title={title} | ||
| onChange={handleFileInputChange} | ||
| className="upload-button-input" | ||
| />; | ||
|
|
||
| return ( | ||
| <TileToolbarButton | ||
| name={name} | ||
| title={title} | ||
| keyHint={keyHint} | ||
| disabled={disabled} | ||
| selected={selected} | ||
| onClick={() => { inputRef.current?.click(); }} | ||
| extraContent={input} | ||
| > | ||
| {children} | ||
| </TileToolbarButton> | ||
| ); | ||
| }; | ||
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,101 @@ | ||
| import React, { useContext } from "react"; | ||
| import { observer } from "mobx-react"; | ||
| import { TileToolbarButton } from "../../components/toolbar/tile-toolbar-button"; | ||
| import { IToolbarButtonComponentProps } from "../../components/toolbar/toolbar-button-manager"; | ||
| import { DrawingContentModelContext } from "./components/drawing-content-context"; | ||
| import { OpenPaletteValues } from "./model/drawing-content"; | ||
| import DeleteIcon from "../../assets/icons/delete/delete-selection-icon.svg"; | ||
| import GroupObjectsIcon from "./assets/group-objects-icon.svg"; | ||
| import UngroupObjectsIcon from "./assets/ungroup-objects-icon.svg"; | ||
| import DuplicateIcon from "./assets/duplicate-icon.svg"; | ||
|
|
||
| import "./drawing-toolbar.scss"; | ||
bacalj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| export const GroupButton = observer(({ name }: IToolbarButtonComponentProps) => { | ||
| const drawingModel = useContext(DrawingContentModelContext); | ||
| const enabled = drawingModel.selection.length > 1; | ||
|
|
||
| function groupSelection() { | ||
| drawingModel.setOpenPalette(OpenPaletteValues.None); | ||
| if (drawingModel.selection.length > 1) { | ||
| drawingModel.createGroup(drawingModel.selection); | ||
| } | ||
| } | ||
| return ( | ||
| <TileToolbarButton | ||
| name={name} title={"Group"} | ||
| onClick={groupSelection} | ||
| disabled={!enabled} | ||
| > | ||
| <GroupObjectsIcon /> | ||
| </TileToolbarButton> | ||
| ); | ||
| }); | ||
|
|
||
| export const UngroupButton = observer(({ name }: IToolbarButtonComponentProps) => { | ||
| const drawingModel = useContext(DrawingContentModelContext); | ||
| const enabled = drawingModel.selection.length > 0 | ||
| ? drawingModel.getSelectedObjects()[0].type === "group" | ||
| : false; | ||
bacalj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| function ungroupSelection() { | ||
| drawingModel.setOpenPalette(OpenPaletteValues.None); | ||
| if (drawingModel.selection.length > 0) { | ||
| drawingModel.ungroupGroups(drawingModel.selection); | ||
| } | ||
| } | ||
| return ( | ||
| <TileToolbarButton | ||
| name={name} | ||
| title={"Ungroup"} | ||
| onClick={ungroupSelection} | ||
| disabled={!enabled} | ||
| > | ||
| <UngroupObjectsIcon /> | ||
| </TileToolbarButton> | ||
| ); | ||
| }); | ||
|
|
||
| // Duplicate | ||
| export const DuplicateButton = observer(({ name }: IToolbarButtonComponentProps) => { | ||
| const drawingModel = useContext(DrawingContentModelContext); | ||
| const enabled = drawingModel.selection.length > 0; | ||
|
|
||
| function duplicateSelection() { | ||
| drawingModel.setOpenPalette(OpenPaletteValues.None); | ||
| drawingModel.duplicateObjects(drawingModel.selection); | ||
| } | ||
|
|
||
| return ( | ||
| <TileToolbarButton | ||
| name={name} | ||
| title={"Duplicate"} | ||
| onClick={duplicateSelection} | ||
| disabled={!enabled} | ||
| > | ||
| <DuplicateIcon /> | ||
| </TileToolbarButton> | ||
| ); | ||
| }); | ||
|
|
||
| // Delete | ||
| export const DeleteButton = observer(({ name }: IToolbarButtonComponentProps) => { | ||
| const drawingModel = useContext(DrawingContentModelContext); | ||
| const enabled = drawingModel.selection.length > 0; | ||
|
|
||
| const deleteSelection = () => { | ||
| drawingModel.setOpenPalette(OpenPaletteValues.None); | ||
| drawingModel.deleteObjects([...drawingModel.selection]); | ||
| }; | ||
|
|
||
| return ( | ||
| <TileToolbarButton | ||
| name={name} | ||
| title={"Delete"} | ||
| onClick={deleteSelection} | ||
| disabled={!enabled} | ||
| > | ||
| <DeleteIcon /> | ||
| </TileToolbarButton> | ||
| ); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like either
onTouchHoldshould be changed to not expect an argument, or an actual event argument should be passed.