From a0f9fb45f633af79a26bd0a60d69743a52550da0 Mon Sep 17 00:00:00 2001 From: Wilder Gonzalez Diaz Date: Fri, 15 Jan 2021 22:29:32 -0500 Subject: [PATCH 1/5] fix: fix application component issue in next.js --- src/libs/utils/getBrowserLocale.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/getBrowserLocale.js b/src/libs/utils/getBrowserLocale.js index 3ed64ae7d..a4917d7f2 100644 --- a/src/libs/utils/getBrowserLocale.js +++ b/src/libs/utils/getBrowserLocale.js @@ -1,8 +1,7 @@ export default function getBrowserLocale() { - return ( - (navigator.languages && navigator.languages[0]) || - navigator.language || - navigator.userLanguage || - 'en-US' - ); + if (typeof window !== 'undefined') { + if (navigator.languages && navigator.languages.length > 0) return navigator.languages[0]; + if (navigator.language) return navigator.language; + } + return 'en-US'; } From c5cf49425ae078fd2f7df2de773bf786c1e4e593 Mon Sep 17 00:00:00 2001 From: Wilder Gonzalez Diaz Date: Sun, 17 Jan 2021 13:41:20 -0500 Subject: [PATCH 2/5] fix: fix FileSelector componemt --- src/components/FileSelector/icon.js | 3 ++- src/components/FileSelector/types.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/components/FileSelector/types.js diff --git a/src/components/FileSelector/icon.js b/src/components/FileSelector/icon.js index a44c55ad5..008e9f989 100644 --- a/src/components/FileSelector/icon.js +++ b/src/components/FileSelector/icon.js @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { ErrorIcon, FileIcon, FilesIcon, UploadIcon } from './icons'; +import { FileListType } from './types'; export default function Icon({ files, error, isDragOver, value, uploadIcon }) { if (value !== null) { @@ -19,7 +20,7 @@ export default function Icon({ files, error, isDragOver, value, uploadIcon }) { return uploadIcon || ; } Icon.propTypes = { - files: PropTypes.instanceOf(FileList), + files: PropTypes.instanceOf(FileListType), error: PropTypes.oneOfType([PropTypes.string, PropTypes.node]), isDragOver: PropTypes.bool, value: PropTypes.object, diff --git a/src/components/FileSelector/types.js b/src/components/FileSelector/types.js new file mode 100644 index 000000000..57cc73707 --- /dev/null +++ b/src/components/FileSelector/types.js @@ -0,0 +1,12 @@ +const isBrowser = !!( + typeof window !== 'undefined' && + window.document && + window.document.createElement +); + +const isNative = typeof navigator !== 'undefined' && navigator.product === 'ReactNative'; + +const isServer = !(isBrowser || isNative); + +// eslint-disable-next-line import/prefer-default-export +export const FileListType = isServer ? Object : window.FileList; From 82d4891f98cfb40a44d93de1de3c6cfb10d885de Mon Sep 17 00:00:00 2001 From: Wilder Gonzalez Diaz Date: Mon, 18 Jan 2021 15:08:54 -0500 Subject: [PATCH 3/5] fix: issues in comments --- src/components/FileSelector/types.js | 10 +--------- src/libs/utils/getBrowserLocale.js | 9 +++++---- src/libs/utils/index.js | 3 ++- src/libs/utils/isServer.js | 11 +++++++++++ 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 src/libs/utils/isServer.js diff --git a/src/components/FileSelector/types.js b/src/components/FileSelector/types.js index 57cc73707..cc2b70002 100644 --- a/src/components/FileSelector/types.js +++ b/src/components/FileSelector/types.js @@ -1,12 +1,4 @@ -const isBrowser = !!( - typeof window !== 'undefined' && - window.document && - window.document.createElement -); - -const isNative = typeof navigator !== 'undefined' && navigator.product === 'ReactNative'; - -const isServer = !(isBrowser || isNative); +import { isServer } from '../../libs/utils'; // eslint-disable-next-line import/prefer-default-export export const FileListType = isServer ? Object : window.FileList; diff --git a/src/libs/utils/getBrowserLocale.js b/src/libs/utils/getBrowserLocale.js index a4917d7f2..d3a53c6a3 100644 --- a/src/libs/utils/getBrowserLocale.js +++ b/src/libs/utils/getBrowserLocale.js @@ -1,7 +1,8 @@ +import isServer from './isServer'; + export default function getBrowserLocale() { - if (typeof window !== 'undefined') { - if (navigator.languages && navigator.languages.length > 0) return navigator.languages[0]; - if (navigator.language) return navigator.language; - } + if (isServer) return 'en-US'; + if (navigator.languages && navigator.languages.length > 0) return navigator.languages[0]; + if (navigator.language) return navigator.language; return 'en-US'; } diff --git a/src/libs/utils/index.js b/src/libs/utils/index.js index 4cbd3c1af..64537a65f 100644 --- a/src/libs/utils/index.js +++ b/src/libs/utils/index.js @@ -2,5 +2,6 @@ import uniqueId from './uniqueId'; import getLocale from './getLocale'; import getBrowserLocale from './getBrowserLocale'; import getSuffixSI from './getSuffixSI'; +import isServer from './isServer'; -export { uniqueId, getLocale, getBrowserLocale, getSuffixSI }; +export { uniqueId, getLocale, getBrowserLocale, getSuffixSI, isServer }; diff --git a/src/libs/utils/isServer.js b/src/libs/utils/isServer.js new file mode 100644 index 000000000..2dcbe910b --- /dev/null +++ b/src/libs/utils/isServer.js @@ -0,0 +1,11 @@ +const isBrowser = !!( + typeof window !== 'undefined' && + window.document && + window.document.createElement +); + +const isNative = typeof navigator !== 'undefined' && navigator.product === 'ReactNative'; + +const isServer = !(isBrowser || isNative); + +export default isServer; From 811957360d4bdc46da31e9b4f9ee58ba29057db8 Mon Sep 17 00:00:00 2001 From: Wilder Gonzalez Diaz Date: Tue, 19 Jan 2021 07:39:39 -0500 Subject: [PATCH 4/5] fix: fix Application theme --- src/styles/helpers/color/isValidColor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/helpers/color/isValidColor.js b/src/styles/helpers/color/isValidColor.js index fdd921c8c..69fb9e866 100644 --- a/src/styles/helpers/color/isValidColor.js +++ b/src/styles/helpers/color/isValidColor.js @@ -1,4 +1,7 @@ +import { isServer } from '../../../libs/utils'; + export default function isValidColor(color) { + if (isServer) return true; const element = document.createElement('a'); element.style.color = color; return element.style.color !== ''; From 3aae8c6e57beaf0e173b6fa46f514a45f546f8de Mon Sep 17 00:00:00 2001 From: Wilder Gonzalez Diaz Date: Tue, 19 Jan 2021 07:45:00 -0500 Subject: [PATCH 5/5] fix: fix index.d.ts in ActivityTimeline --- src/components/ActivityTimeline/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ActivityTimeline/index.d.ts b/src/components/ActivityTimeline/index.d.ts index 25ec69196..9836e6bbe 100644 --- a/src/components/ActivityTimeline/index.d.ts +++ b/src/components/ActivityTimeline/index.d.ts @@ -10,6 +10,7 @@ interface onToggleSectionEventShape { export interface ActivityTimelineProps extends BaseProps { children?: ReactNode; + variant?: 'default' | 'accordion'; multiple?: boolean; onToggleSection?: (value: onToggleSectionEventShape) => void; activeSectionNames?: Names;