(WrappedComponent handleWrapperClass={styles['resizer-' + resizeSide]} > - + ); } diff --git a/src/components/Input/index.tsx b/src/components/Input/index.tsx index a76b0e29..83e9b997 100644 --- a/src/components/Input/index.tsx +++ b/src/components/Input/index.tsx @@ -10,7 +10,7 @@ interface IProps { disabled?: boolean className?: string onBlur?: () => void - inputRef?: React.RefObject + inputRef?: React.RefObject onKeyPress?: () => void spellCheck?: boolean } diff --git a/src/components/Link/index.tsx b/src/components/Link/index.tsx index 0d10167a..3b5fa10d 100644 --- a/src/components/Link/index.tsx +++ b/src/components/Link/index.tsx @@ -3,6 +3,7 @@ import React from 'react'; interface IProps { className?: string href?: string + children?: React.ReactNode } export default class Link extends React.Component{ diff --git a/src/components/NewFileBtn/index.tsx b/src/components/NewFileBtn/index.tsx index bcc07fa7..d399fc84 100644 --- a/src/components/NewFileBtn/index.tsx +++ b/src/components/NewFileBtn/index.tsx @@ -12,19 +12,19 @@ interface IInjectedProps { export const menuItems = { 'Account script': { - icon: 'accountdocIcn', content: '{-# STDLIB_VERSION 5 #-}\n' + + icon: 'accountdocIcn', content: '{-# STDLIB_VERSION 9 #-}\n' + '{-# CONTENT_TYPE EXPRESSION #-}\n' + '{-# SCRIPT_TYPE ACCOUNT #-}\n\n' + 'sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)' }, 'Asset script': { - icon: 'assetdocIcn', content: '{-# STDLIB_VERSION 5 #-}\n' + + icon: 'assetdocIcn', content: '{-# STDLIB_VERSION 9 #-}\n' + '{-# CONTENT_TYPE EXPRESSION #-}\n' + '{-# SCRIPT_TYPE ASSET #-}\n\n' + 'true' }, 'dApp script': { - icon: 'dappdocIcn', content: `{-# STDLIB_VERSION 5 #-} + icon: 'dappdocIcn', content: `{-# STDLIB_VERSION 9 #-} {-# CONTENT_TYPE DAPP #-} {-# SCRIPT_TYPE ACCOUNT #-} @@ -79,10 +79,21 @@ interface INewFileBtnProps { @inject('filesStore') export default class NewFileBtn extends React.Component { - handleClick = (title: string, content: string) => () => { + handleClick = async (title: string, content: string) => { + console.log('>>> handleClick вызван для:', title); const type = title === 'Test' ? FILE_TYPE.JAVA_SCRIPT : FILE_TYPE.RIDE; - this.props.filesStore!.createFile({type, content}, true) - .then(() => logToTagManager({event: 'ideFileCreate', fileType: type})); + + if (!this.props.filesStore) { + console.error('filesStore is not available'); + return; + } + + try { + await this.props.filesStore.createFile({type, content}, true); + logToTagManager({event: 'ideFileCreate', fileType: type}); + } catch (e) { + console.error('Failed to create file:', e); + } }; buttonElement = (position: string) => position === 'topBar' ? @@ -99,11 +110,10 @@ export default class NewFileBtn extends React.Component ({ - icon: styles[icon], - title: title, - clickHandler: this.handleClick(title, content) - }) - )} + icon: styles[icon], + title: title, + clickHandler: () => this.handleClick(title, content) + }))} />; } } diff --git a/src/components/NewRepl/components/Line/LineMenu/index.tsx b/src/components/NewRepl/components/Line/LineMenu/index.tsx index 37aa2531..02397122 100755 --- a/src/components/NewRepl/components/Line/LineMenu/index.tsx +++ b/src/components/NewRepl/components/Line/LineMenu/index.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; import styles from './styles.less'; import cn from 'classnames'; -import copyToClipboard from 'copy-to-clipboard'; +import { copySync } from '@utils/copyText'; interface IProps { value: string } export class LineMenu extends React.Component { - handleCopy = (str: string) => () => copyToClipboard(str); + handleCopy = (str: string) => () => copySync(str); render() { const {value} = this.props; diff --git a/src/components/NewRepl/components/Type/types/EntryType.tsx b/src/components/NewRepl/components/Type/types/EntryType.tsx index 6b2289d4..79323b1a 100755 --- a/src/components/NewRepl/components/Type/types/EntryType.tsx +++ b/src/components/NewRepl/components/Type/types/EntryType.tsx @@ -34,7 +34,7 @@ export class EntryType extends React.Component { - => + {'=> '} diff --git a/src/components/NewRepl/components/Type/types/ObjectType.tsx b/src/components/NewRepl/components/Type/types/ObjectType.tsx index acc27dc4..edd18c8e 100755 --- a/src/components/NewRepl/components/Type/types/ObjectType.tsx +++ b/src/components/NewRepl/components/Type/types/ObjectType.tsx @@ -37,6 +37,8 @@ interface IObjectTypeProps { type?: string } +type TObjectEntry = { key: string; value: React.ReactNode }; + export class ObjectType extends React.Component { state = { @@ -97,7 +99,7 @@ export class ObjectType extends React.Component { props.splice(LIMIT_CLOSED); } - let types = props.sort().map((key, i) => { + let types: Array = props.sort().map((key, i) => { const Type = which(value[key]); return { key, @@ -151,13 +153,15 @@ export class ObjectType extends React.Component { {displayName} {'{'} - {types.map((obj, i) => (obj && obj.key && obj.value) - ? - {obj.key}: - {obj.value} - - : obj - )} + {types.map((obj, i) => { + if (obj && typeof obj === 'object' && 'key' in obj && 'value' in obj) { + return + {obj.key}: + {obj.value} + ; + } + return obj; + })} {'}'} ); @@ -171,12 +175,15 @@ export class ObjectType extends React.Component { {'{'}