From dc7d8ccd66428d5654877a8cd4729d42a19143a6 Mon Sep 17 00:00:00 2001 From: Vyacheslav 'SLEL' Solomin Date: Wed, 7 Jul 2021 23:47:40 +0300 Subject: [PATCH 1/4] refactor: rename fileinput --- .../file-input/src/{FileInput.ts => FileInput.Filestack.ts} | 4 ++-- packages/file-input/src/index.ts | 2 +- .../{index.test.tsx => FileInput.Filestack.test.tsx} | 0 ...{index.test.tsx.snap => FileInput.Filestack.test.tsx.snap} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename packages/file-input/src/{FileInput.ts => FileInput.Filestack.ts} (97%) rename packages/file-input/test/__tests__/{index.test.tsx => FileInput.Filestack.test.tsx} (100%) rename packages/file-input/test/__tests__/__snapshots__/{index.test.tsx.snap => FileInput.Filestack.test.tsx.snap} (100%) diff --git a/packages/file-input/src/FileInput.ts b/packages/file-input/src/FileInput.Filestack.ts similarity index 97% rename from packages/file-input/src/FileInput.ts rename to packages/file-input/src/FileInput.Filestack.ts index 84f4dd5..b94b3a9 100644 --- a/packages/file-input/src/FileInput.ts +++ b/packages/file-input/src/FileInput.Filestack.ts @@ -16,7 +16,7 @@ const FILE_UPLOAD_INFO_QUERY = gql` } `; -const FileInput: React.ComponentType = withApollo( +const FileInputFilestack: React.ComponentType = withApollo( // @ts-ignore class FileInput extends React.Component, FileInputState> { public static defaultProps = { @@ -169,4 +169,4 @@ const FileInput: React.ComponentType = withApollo( }, ); -export { FileInput }; +export { FileInputFilestack }; diff --git a/packages/file-input/src/index.ts b/packages/file-input/src/index.ts index eca4452..209e201 100644 --- a/packages/file-input/src/index.ts +++ b/packages/file-input/src/index.ts @@ -1,2 +1,2 @@ -export { FileInput } from './FileInput'; +export { FileInput } from './FileInput.Filestack'; export * from './types'; diff --git a/packages/file-input/test/__tests__/index.test.tsx b/packages/file-input/test/__tests__/FileInput.Filestack.test.tsx similarity index 100% rename from packages/file-input/test/__tests__/index.test.tsx rename to packages/file-input/test/__tests__/FileInput.Filestack.test.tsx diff --git a/packages/file-input/test/__tests__/__snapshots__/index.test.tsx.snap b/packages/file-input/test/__tests__/__snapshots__/FileInput.Filestack.test.tsx.snap similarity index 100% rename from packages/file-input/test/__tests__/__snapshots__/index.test.tsx.snap rename to packages/file-input/test/__tests__/__snapshots__/FileInput.Filestack.test.tsx.snap From a13e92c7801527e7065cb8e22c2f462326a657f9 Mon Sep 17 00:00:00 2001 From: Vyacheslav 'SLEL' Solomin Date: Wed, 7 Jul 2021 23:48:33 +0300 Subject: [PATCH 2/4] refactor: replace filestack fileinput --- .../src/{ => components/filestack}/FileInput.Filestack.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename packages/file-input/src/{ => components/filestack}/FileInput.Filestack.ts (98%) diff --git a/packages/file-input/src/FileInput.Filestack.ts b/packages/file-input/src/components/filestack/FileInput.Filestack.ts similarity index 98% rename from packages/file-input/src/FileInput.Filestack.ts rename to packages/file-input/src/components/filestack/FileInput.Filestack.ts index b94b3a9..8eb76bc 100644 --- a/packages/file-input/src/FileInput.Filestack.ts +++ b/packages/file-input/src/components/filestack/FileInput.Filestack.ts @@ -3,7 +3,7 @@ import { withApollo, WithApolloClient } from 'react-apollo'; import { ApolloClient } from 'apollo-client'; import * as filestack from 'filestack-js'; import gql from 'graphql-tag'; -import { FileInputProps, FileInputState } from './types'; +import { FileInputProps, FileInputState } from '../../types'; const FILE_UPLOAD_INFO_QUERY = gql` query FileUploadInfo { From 62d57084e3e06b09fd18be7f73fa293847744f09 Mon Sep 17 00:00:00 2001 From: Vyacheslav 'SLEL' Solomin Date: Thu, 8 Jul 2021 00:00:29 +0300 Subject: [PATCH 3/4] wip --- packages/file-input/src/components/FileInput.ts | 8 ++++++++ packages/file-input/src/index.ts | 2 +- packages/file-input/src/types.ts | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 packages/file-input/src/components/FileInput.ts diff --git a/packages/file-input/src/components/FileInput.ts b/packages/file-input/src/components/FileInput.ts new file mode 100644 index 0000000..3e63ea4 --- /dev/null +++ b/packages/file-input/src/components/FileInput.ts @@ -0,0 +1,8 @@ +import React from 'react'; +import { FileInputProps, FileInputState } from '../types'; +import { FileInputFilestack } from '../components/filestack/FileInput.Filestack'; + +export const FileInput: React.FC = (props) => { + + return ; +} \ No newline at end of file diff --git a/packages/file-input/src/index.ts b/packages/file-input/src/index.ts index 209e201..eca4452 100644 --- a/packages/file-input/src/index.ts +++ b/packages/file-input/src/index.ts @@ -1,2 +1,2 @@ -export { FileInput } from './FileInput.Filestack'; +export { FileInput } from './FileInput'; export * from './types'; diff --git a/packages/file-input/src/types.ts b/packages/file-input/src/types.ts index 995301e..fd3decb 100644 --- a/packages/file-input/src/types.ts +++ b/packages/file-input/src/types.ts @@ -19,7 +19,7 @@ export type FileInputProps = { value: FileInputValue | null; originalFile: OriginalFileInputValue | null; error: object | null; - }) => React.ReactNode; + }) => JSX.Element; public?: boolean; fetchPolicy?: FetchPolicy; maxFiles?: number; From 5640b247572e620bf3159890d41d5b970a2c291f Mon Sep 17 00:00:00 2001 From: Vyacheslav 'SLEL' Solomin Date: Fri, 13 Aug 2021 15:59:24 +0300 Subject: [PATCH 4/4] wip --- examples/guest-app/public/index.html | 1 + examples/guest-app/src/App.js | 72 ++--- packages/file-input/package.json | 4 +- packages/file-input/src/FileInput.aws.tsx | 135 ++++++++++ ...ut.Filestack.ts => FileInput.filestack.ts} | 5 +- packages/file-input/src/FileInput.tsx | 71 +++++ .../file-input/src/components/FileInput.ts | 8 - .../FilePicker/FilePicker.constants.ts | 8 + .../src/components/FilePicker/index.ts | 1 + .../components/FilePicker/view/CloseIcon.tsx | 22 ++ .../components/FilePicker/view/FileIcon.tsx | 16 ++ .../FilePicker/view/FilePicker.content.tsx | 151 +++++++++++ .../FilePicker/view/FilePicker.dropzone.tsx | 20 ++ .../view/FilePicker.filePreview.tsx | 48 ++++ .../FilePicker/view/FilePicker.styles.ts | 186 +++++++++++++ .../src/components/Modal/Modal.style.ts | 37 +++ .../file-input/src/components/Modal/Modal.tsx | 60 +++++ .../file-input/src/components/Modal/index.ts | 1 + packages/file-input/src/components/index.ts | 2 + packages/file-input/src/hooks/index.ts | 2 + .../src/hooks/useFilePicker.constants.ts | 8 + .../file-input/src/hooks/useFilePicker.gql.ts | 15 ++ .../file-input/src/hooks/useFilePicker.ts | 240 +++++++++++++++++ .../src/hooks/useFilePicker.types.ts | 30 +++ packages/file-input/src/index.ts | 2 +- packages/file-input/src/types.ts | 39 ++- packages/file-input/src/utils/index.ts | 77 ++++++ yarn.lock | 253 +++++++++++++++++- 28 files changed, 1458 insertions(+), 56 deletions(-) create mode 100644 packages/file-input/src/FileInput.aws.tsx rename packages/file-input/src/{components/filestack/FileInput.Filestack.ts => FileInput.filestack.ts} (95%) create mode 100644 packages/file-input/src/FileInput.tsx delete mode 100644 packages/file-input/src/components/FileInput.ts create mode 100644 packages/file-input/src/components/FilePicker/FilePicker.constants.ts create mode 100644 packages/file-input/src/components/FilePicker/index.ts create mode 100644 packages/file-input/src/components/FilePicker/view/CloseIcon.tsx create mode 100644 packages/file-input/src/components/FilePicker/view/FileIcon.tsx create mode 100644 packages/file-input/src/components/FilePicker/view/FilePicker.content.tsx create mode 100644 packages/file-input/src/components/FilePicker/view/FilePicker.dropzone.tsx create mode 100644 packages/file-input/src/components/FilePicker/view/FilePicker.filePreview.tsx create mode 100644 packages/file-input/src/components/FilePicker/view/FilePicker.styles.ts create mode 100644 packages/file-input/src/components/Modal/Modal.style.ts create mode 100644 packages/file-input/src/components/Modal/Modal.tsx create mode 100644 packages/file-input/src/components/Modal/index.ts create mode 100644 packages/file-input/src/components/index.ts create mode 100644 packages/file-input/src/hooks/index.ts create mode 100644 packages/file-input/src/hooks/useFilePicker.constants.ts create mode 100644 packages/file-input/src/hooks/useFilePicker.gql.ts create mode 100644 packages/file-input/src/hooks/useFilePicker.ts create mode 100644 packages/file-input/src/hooks/useFilePicker.types.ts create mode 100644 packages/file-input/src/utils/index.ts diff --git a/examples/guest-app/public/index.html b/examples/guest-app/public/index.html index dd1ccfd..cf4a584 100644 --- a/examples/guest-app/public/index.html +++ b/examples/guest-app/public/index.html @@ -24,6 +24,7 @@
+