Added Standard with Typescript + Moved module methods to utils/itertools
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Siklos 2022-08-05 19:52:09 +02:00
parent 8e34d6b72a
commit 361a200d07
24 changed files with 258 additions and 223 deletions

View file

@ -1,31 +1,32 @@
import * as React from 'react';
import { motion } from 'framer-motion';
import { Properties } from '../Properties/Properties';
import { IContainerModel, getDepth, MakeIterator } from '../../Interfaces/ContainerModel';
import { IContainerModel } from '../../Interfaces/ContainerModel';
import { getDepth, MakeIterator } from '../../utils/itertools';
interface IElementsSidebarProps {
MainContainer: IContainerModel | null,
isOpen: boolean,
MainContainer: IContainerModel | null
isOpen: boolean
isHistoryOpen: boolean
SelectedContainer: IContainerModel | null,
onClick: () => void,
onPropertyChange: (key: string, value: string) => void,
SelectedContainer: IContainerModel | null
onClick: () => void
onPropertyChange: (key: string, value: string) => void
selectContainer: (container: IContainerModel) => void
}
export class ElementsSidebar extends React.PureComponent<IElementsSidebarProps> {
public iterateChilds(handleContainer: (container: IContainerModel) => void): React.ReactNode {
if (!this.props.MainContainer) {
if (this.props.MainContainer == null) {
return null;
}
const it = MakeIterator(this.props.MainContainer);
for (const container of it) {
handleContainer(container as IContainerModel);
handleContainer(container);
}
}
public render() {
public render(): JSX.Element {
let isOpenClasses = '-right-64';
if (this.props.isOpen) {
isOpenClasses = this.props.isHistoryOpen

View file

@ -9,7 +9,7 @@ interface IFloatingButtonProps {
const toggleState = (
isHidden: boolean,
setHidden: React.Dispatch<React.SetStateAction<boolean>>
) => {
): void => {
setHidden(!isHidden);
};

View file

@ -2,19 +2,19 @@ import * as React from 'react';
import { IHistoryState } from '../../App';
interface IHistoryProps {
history: IHistoryState[],
historyCurrentStep: number,
isOpen: boolean,
onClick: () => void,
history: IHistoryState[]
historyCurrentStep: number
isOpen: boolean
onClick: () => void
jumpTo: (move: number) => void
}
export class History extends React.PureComponent<IHistoryProps> {
public render() {
public render(): JSX.Element {
const isOpenClasses = this.props.isOpen ? 'right-0' : '-right-64';
const states = this.props.history.map((step, move) => {
const desc = move
const desc = move > 0
? `Go to modification n°${move}`
: 'Go to the beginning';

View file

@ -1,7 +1,7 @@
import * as React from 'react';
interface IMainMenuProps {
newEditor: () => void;
newEditor: () => void
loadEditor: (files: FileList | null) => void
}

View file

@ -2,7 +2,7 @@ import * as React from 'react';
import ContainerProperties from '../../Interfaces/Properties';
interface IPropertiesProps {
properties?: ContainerProperties,
properties?: ContainerProperties
onChange: (key: string, value: string) => void
}
@ -27,7 +27,7 @@ export class Properties extends React.PureComponent<IPropertiesProps> {
public handleProperties = (
[key, value]: [string, string | number],
groupInput: React.ReactNode[]
) => {
): void => {
const id = `property-${key}`;
const type = 'text';
const isDisabled = key === 'id' || key === 'parentId'; // hardcoded

View file

@ -1,5 +1,6 @@
import * as React from 'react';
import { getDepth, IContainerModel } from '../../../Interfaces/ContainerModel';
import { IContainerModel } from '../../../Interfaces/ContainerModel';
import { getDepth } from '../../../utils/itertools';
import { Dimension } from './Dimension';
export interface IContainerProps {
@ -20,11 +21,11 @@ export class Container extends React.PureComponent<IContainerProps> {
const transform = `translate(${Number(this.props.model.properties.x)}, ${Number(this.props.model.properties.y)})`;
// g style
const defaultStyle = {
const defaultStyle: React.CSSProperties = {
transitionProperty: 'all',
transitionTimingFunction: 'cubic-bezier(0.4, 0, 0.2, 1)',
transitionDuration: '150ms'
} as React.CSSProperties;
};
// Rect style
const style = Object.assign(

View file

@ -1,19 +1,19 @@
import * as React from 'react';
interface IDimensionProps {
id: string;
xStart: number;
xEnd: number;
y: number;
text: string;
strokeWidth: number;
id: string
xStart: number
xEnd: number
y: number
text: string
strokeWidth: number
}
export class Dimension extends React.PureComponent<IDimensionProps> {
public render() {
const style = {
public render(): JSX.Element {
const style: React.CSSProperties = {
stroke: 'black'
} as React.CSSProperties;
};
return (
<g key={this.props.id}>
<line

View file

@ -1,10 +1,11 @@
import * as React from 'react';
import { ContainerModel, getDepth, MakeIterator } from '../../../Interfaces/ContainerModel';
import { ContainerModel } from '../../../Interfaces/ContainerModel';
import { getDepth, MakeIterator } from '../../../utils/itertools';
import { Dimension } from './Dimension';
interface IDimensionLayerProps {
isHidden: boolean,
roots: ContainerModel | ContainerModel[] | null,
isHidden: boolean
roots: ContainerModel | ContainerModel[] | null
}
const GAP: number = 50;

View file

@ -1,5 +1,6 @@
import * as React from 'react';
import { IContainerModel, getAbsolutePosition } from '../../../Interfaces/ContainerModel';
import { IContainerModel } from '../../../Interfaces/ContainerModel';
import { getAbsolutePosition } from '../../../utils/itertools';
interface ISelectorProps {
selected: IContainerModel | null
@ -18,7 +19,7 @@ export const Selector: React.FC<ISelectorProps> = (props) => {
props.selected.properties.width,
props.selected.properties.height
];
const style = {
const style: React.CSSProperties = {
stroke: '#3B82F6', // tw blue-500
strokeWidth: 4,
fillOpacity: 0,
@ -26,7 +27,7 @@ export const Selector: React.FC<ISelectorProps> = (props) => {
transitionTimingFunction: 'cubic-bezier(0.4, 0, 0.2, 1)',
transitionDuration: '150ms',
animation: 'fadein 750ms ease-in alternate infinite'
} as React.CSSProperties;
};
return (
<rect

View file

@ -1,34 +1,21 @@
import * as React from 'react';
import { ReactSVGPanZoom, Tool, Value, TOOL_PAN } from 'react-svg-pan-zoom';
import { UncontrolledReactSVGPanZoom } from 'react-svg-pan-zoom';
import { Container } from './Elements/Container';
import { ContainerModel } from '../../Interfaces/ContainerModel';
import { Selector } from './Elements/Selector';
interface ISVGProps {
width: number,
height: number,
children: ContainerModel | ContainerModel[] | null,
width: number
height: number
children: ContainerModel | ContainerModel[] | null
selected: ContainerModel | null
}
interface ISVGState {
value: Value,
tool: Tool
}
export class SVG extends React.PureComponent<ISVGProps> {
public state: ISVGState;
public static ID = 'svg';
constructor(props: ISVGProps) {
super(props);
this.state = {
value: {
viewerWidth: window.innerWidth,
viewerHeight: window.innerHeight
} as Value,
tool: TOOL_PAN
};
}
render() {
@ -49,13 +36,11 @@ export class SVG extends React.PureComponent<ISVGProps> {
return (
<div id={SVG.ID}>
<ReactSVGPanZoom
<UncontrolledReactSVGPanZoom
width={window.innerWidth}
height={window.innerHeight}
background={'#ffffff'}
defaultTool='pan'
value={this.state.value} onChangeValue={value => this.setState({ value })}
tool={this.state.tool} onChangeTool={tool => this.setState({ tool })}
miniatureProps={{
position: 'left',
background: '#616264',
@ -67,9 +52,8 @@ export class SVG extends React.PureComponent<ISVGProps> {
{ children }
<Selector selected={this.props.selected} />
</svg>
</ReactSVGPanZoom>
</UncontrolledReactSVGPanZoom>
</div>
);
};
}

View file

@ -3,13 +3,13 @@ import { AvailableContainer } from '../../Interfaces/AvailableContainer';
interface ISidebarProps {
componentOptions: AvailableContainer[]
isOpen: boolean;
onClick: () => void;
buttonOnClick: (type: string) => void;
isOpen: boolean
onClick: () => void
buttonOnClick: (type: string) => void
}
export default class Sidebar extends React.PureComponent<ISidebarProps> {
public render() {
public render(): JSX.Element {
const listElements = this.props.componentOptions.map(componentOption =>
<button className='hover:bg-blue-600 transition-all sidebar-row' key={componentOption.Type} onClick={() => this.props.buttonOnClick(componentOption.Type)}>
{componentOption.Type}