This commit is contained in:
Robert Stewart (eXcell 2020-10-16 03:55:55 -07:00
Родитель 680e47481e
Коммит b6557e864c
4 изменённых файлов: 13 добавлений и 12 удалений

Просмотреть файл

@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
import { Customizer, ICustomizations, ChoiceGroup, IChoiceGroupOption, PrimaryButton, DetailsList, IColumn, TextField, Dropdown, SelectionMode, DetailsListLayoutMode, FontIcon, CheckboxVisibility, IContextualMenuItem, CommandBar, Selection, Separator, IObjectWithKey } from "@fluentui/react"; import { Customizer, ICustomizations, ChoiceGroup, IChoiceGroupOption, PrimaryButton, DetailsList, IColumn, TextField, Dropdown, SelectionMode, DetailsListLayoutMode, FontIcon, CheckboxVisibility, IContextualMenuItem, CommandBar, Selection, Separator, IObjectWithKey } from "@fluentui/react";
import { getPrimaryGreyTheme, getPrimaryGreenTheme, getRightPaneDefaultButtonTheme, getGreenWithWhiteBackgroundTheme, getPrimaryBlueTheme, getDefaultTheme } from '../../../../common/themes'; import { getPrimaryGreyTheme, getPrimaryGreenTheme, getRightPaneDefaultButtonTheme, getGreenWithWhiteBackgroundTheme, getPrimaryBlueTheme, getDefaultTheme } from '../../../../common/themes';
import { FieldFormat, FieldType, IApplicationState, ITableTag, ITag, TagInputMode } from '../../../../models/applicationState'; import { FieldFormat, FieldType, IApplicationState, ITableRegion, ITableTag, ITag, TagInputMode } from '../../../../models/applicationState';
import { filterFormat } from "../../../../common/utils"; import { filterFormat } from "../../../../common/utils";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import "./tableTagConfig.scss"; import "./tableTagConfig.scss";
@ -27,7 +27,7 @@ interface IShareState {
} }
interface ITableTagConfigProps { interface ITableTagConfigProps {
setTagInputMode: (addTableMode: TagInputMode) => void; setTagInputMode: (addTableMode: TagInputMode, selectedTableTagToLabel?: ITableTag, selectedTableTagBody?: ITableRegion[][][]) => void;
addTableTag: (table: any) => void; addTableTag: (table: any) => void;
splitPaneWidth: number; splitPaneWidth: number;
tableTag?: ITableTag; tableTag?: ITableTag;
@ -503,7 +503,7 @@ export default function TableTagConfig(props: ITableTagConfigProps) {
tableTagToAdd["rows"] = trimFieldNames(rows); tableTagToAdd["rows"] = trimFieldNames(rows);
} }
addTableTag(tableTagToAdd); addTableTag(tableTagToAdd);
setTagInputMode(TagInputMode.Basic); setTagInputMode(TagInputMode.Basic, null, null);
} }
function hasEmptyNames(array: ITableConfigItem[]) { function hasEmptyNames(array: ITableConfigItem[]) {
@ -767,7 +767,7 @@ export default function TableTagConfig(props: ITableTagConfigProps) {
<PrimaryButton <PrimaryButton
className="cancel" className="cancel"
theme={getPrimaryGreyTheme()} theme={getPrimaryGreyTheme()}
onClick={() => setTagInputMode(TagInputMode.Basic)} onClick={() => setTagInputMode(TagInputMode.Basic, null, null)}
>Cancel</PrimaryButton> >Cancel</PrimaryButton>
<PrimaryButton <PrimaryButton
className="save" className="save"

Просмотреть файл

@ -11,7 +11,7 @@ import { strings } from "../../../../common/strings";
interface ITableTagLabelingProps { interface ITableTagLabelingProps {
setTagInputMode: (addTableMode: TagInputMode) => void; setTagInputMode: (addTableMode: TagInputMode, selectedTableTagToLabel?: ITableTag, selectedTableTagBody?: ITableRegion[][][]) => void;
selectedTag: ITableTag, selectedTag: ITableTag,
selectedRegions?: IRegion[]; selectedRegions?: IRegion[];
onTagClick?: (tag: ITableTag) => void; onTagClick?: (tag: ITableTag) => void;
@ -111,7 +111,7 @@ export default class TableTagLabeling extends React.Component<ITableTagLabelingP
className="button-done" className="button-done"
theme={getPrimaryGreenTheme()} theme={getPrimaryGreenTheme()}
onClick={() => { onClick={() => {
this.props.setTagInputMode(TagInputMode.Basic) this.props.setTagInputMode(TagInputMode.Basic, null, null)
}} }}
>{strings.tags.regionTableTags.tableLabeling.buttons.done} >{strings.tags.regionTableTags.tableLabeling.buttons.done}
</PrimaryButton> </PrimaryButton>
@ -159,7 +159,7 @@ export default class TableTagLabeling extends React.Component<ITableTagLabelingP
} }
private addRow = () => { private addRow = () => {
this.props.addRowToDynamicTable() this.props.addRowToDynamicTable()
}; };
private handleCellClick = (iToChange, jToChange) => { private handleCellClick = (iToChange, jToChange) => {

Просмотреть файл

@ -4,7 +4,7 @@
import React from "react"; import React from "react";
import { IconButton } from "@fluentui/react"; import { IconButton } from "@fluentui/react";
import { strings } from "../../../../common/strings"; import { strings } from "../../../../common/strings";
import { ITableTag, ITag, TagInputMode } from "../../../../models/applicationState"; import { ITableRegion, ITableTag, ITag, TagInputMode } from "../../../../models/applicationState";
enum Categories { enum Categories {
General, General,
@ -19,7 +19,7 @@ export interface ITagInputToolbarProps {
/** Function to call when add tags button is clicked */ /** Function to call when add tags button is clicked */
onAddTags: () => void; onAddTags: () => void;
setTagInputMode?: (tagInputMode: TagInputMode, selectedTableTagToLabel?: ITableTag) => void; setTagInputMode?: (tagInputMode: TagInputMode, selectedTableTagToLabel?: ITableTag, selectedTableTagBody?: ITableRegion[][][]) => void;
/** Function to call when search tags button is clicked */ /** Function to call when search tags button is clicked */
onSearchTags: () => void; onSearchTags: () => void;
/** Function to call when lock tags button is clicked */ /** Function to call when lock tags button is clicked */
@ -152,7 +152,7 @@ export default class TagInputToolbar extends React.Component<ITagInputToolbarPro
} }
private handleAddTable = () => { private handleAddTable = () => {
this.props.setTagInputMode(TagInputMode.ConfigureTable, null); this.props.setTagInputMode(TagInputMode.ConfigureTable, null, null);
} }
private handleSearch = () => { private handleSearch = () => {

Просмотреть файл

@ -428,10 +428,11 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
private onPageClick = () => { private onPageClick = () => {
} }
private setTagInputMode = (tagInputMode: TagInputMode, selectedTableTagToLabel: ITableTag = this.state.selectedTableTagToLabel) => { private setTagInputMode = (tagInputMode: TagInputMode, selectedTableTagToLabel: ITableTag = this.state.selectedTableTagToLabel, selectedTableTagBody: ITableRegion[][][] = this.state.selectedTableTagBody) => {
this.resizeCanvas(); // this.resizeCanvas();
this.setState({ this.setState({
selectedTableTagBody,
selectedTableTagToLabel, selectedTableTagToLabel,
tagInputMode, tagInputMode,
}, () => { }, () => {