tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds paths to local ts declarations

Browse Source
This commit is contained in:
James
2020-11-25 10:50:35 -05:00
parent 4239f8e592
commit ed8d7f2106
10 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -40,7 +40,7 @@
"@faceless-ui/modal": "^1.0.4",
"@faceless-ui/scroll-info": "^1.1.1",
"@faceless-ui/window-info": "^1.2.2",
"@payloadcms/config-provider": "0.0.7",
"@payloadcms/config-provider": "0.0.9",
"@typescript-eslint/parser": "4.0.1",
"@udecode/slate-plugins": "^0.64.3",
"ajv": "^6.12.6",

10
src/admin/components/utilities/Locale/index.tsx
View File

@@ -5,17 +5,17 @@ import PropTypes from 'prop-types';
import { useConfig } from '@payloadcms/config-provider';
import { useSearchParams } from '../SearchParams';
const Context = createContext({});
const Context = createContext('');
export const LocaleProvider = ({ children }) => {
export const LocaleProvider: React.FC = ({ children }) => {
const { localization } = useConfig();
const defaultLocale = (localization && localization.defaultLocale) ? localization.defaultLocale : 'en';
const [locale, setLocale] = useState(defaultLocale);
const [locale, setLocale] = useState<string>(defaultLocale);
const searchParams = useSearchParams();
const localeFromParams = searchParams.locale;
useEffect(() => {
if (localeFromParams && localization.locales.indexOf(localeFromParams) > -1) setLocale(localeFromParams);
if (localeFromParams && localization.locales.indexOf(localeFromParams) > -1) setLocale(localeFromParams as string);
}, [localeFromParams, localization]);
return (
@@ -25,7 +25,7 @@ export const LocaleProvider = ({ children }) => {
);
};
export const useLocale = () => useContext(Context);
export const useLocale = (): string => useContext(Context);
LocaleProvider.propTypes = {
children: PropTypes.oneOfType([

6
src/admin/components/utilities/Meta/index.tsx
View File

@@ -13,9 +13,9 @@ const Meta: React.FC<Props> = ({
keywords = 'CMS, Admin, Dashboard',
}) => {
const config = useConfig();
const titleSuffix = config?.admin?.meta?.titleSuffix ?? '- Payload';
const favicon = config?.admin?.meta?.favicon ?? payloadFavicon;
const ogImage = config?.admin?.meta?.ogImage ?? payloadOgImage;
const titleSuffix = config.admin.meta?.titleSuffix ?? '- Payload';
const favicon = config.admin.meta.favicon ?? payloadFavicon;
const ogImage = config.admin.meta.ogImage ?? payloadOgImage;
return (
<Helmet

3
src/admin/components/utilities/Portal/index.tsx
View File

@@ -1,5 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
const Portal = ({ children }) => ReactDOM.createPortal(children, document.getElementById('portal'));
const Portal = ({ children }: { children: React.ReactNode}): React.ReactPortal => ReactDOM.createPortal(children, document.getElementById('portal'));
export default Portal;

22
src/admin/components/utilities/RenderCustomComponent/index.tsx
View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Props } from './types';
const RenderCustomComponent = (props) => {
const RenderCustomComponent: React.FC<Props> = (props) => {
const { CustomComponent, DefaultComponent, componentProps } = props;
if (CustomComponent) {
@@ -15,22 +15,4 @@ const RenderCustomComponent = (props) => {
);
};
RenderCustomComponent.defaultProps = {
path: undefined,
componentProps: {},
CustomComponent: null,
};
RenderCustomComponent.propTypes = {
path: PropTypes.string,
DefaultComponent: PropTypes.oneOfType([
PropTypes.shape({}),
PropTypes.func,
PropTypes.node,
PropTypes.element,
]).isRequired,
CustomComponent: PropTypes.func,
componentProps: PropTypes.shape({}),
};
export default RenderCustomComponent;

7
src/admin/components/utilities/RenderCustomComponent/types.ts Normal file
View File

@@ -0,0 +1,7 @@
import React from 'react';
export type Props = {
CustomComponent: React.FC
DefaultComponent: React.FC
componentProps: unknown
}

4
src/admin/components/utilities/SearchParams/index.tsx
View File

@@ -5,7 +5,7 @@ import qs from 'qs';
const Context = createContext({});
export const SearchParamsProvider = ({ children }) => {
export const SearchParamsProvider: React.FC = ({ children }) => {
const location = useLocation();
const params = qs.parse(
@@ -27,4 +27,4 @@ SearchParamsProvider.propTypes = {
]).isRequired,
};
export const useSearchParams = () => useContext(Context);
export const useSearchParams = (): qs.ParsedQs => useContext(Context);

22
src/types/assets/index.d.ts vendored
View File

@@ -1,22 +0,0 @@
declare module '*.svg' {
import React = require('react');
export const ReactComponent: React.SFC<React.SVGProps<SVGSVGElement>>;
const src: string;
export default src;
}
declare module '*.jpg' {
const content: string;
export default content;
}
declare module '*.png' {
const content: string;
export default content;
}
declare module '*.json' {
const content: string;
export default content;
}

15
tsconfig.json
View File

@@ -18,16 +18,21 @@
"payload/config": [
"src/admin/types/config" // Webpack alias to user config
],
"@payloadcms/payload/config": [
"src/config/types.ts"
],
"@payloadcms/payload/auth": [
"src/auth/types.ts"
],
"@payloadcms/payload/types": [
"src/types/index.ts"
]
},
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
"resolveJsonModule": true,
"inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
// "typeRoots": [
// "./src",
// "./node_modules/@types"
// ]
},
"include": [
"src/"
@@ -38,6 +43,6 @@
"build",
"src/tests",
"src/tests/**/*.spec.ts",
// "node_modules/"
"node_modules"
]
}

8
yarn.lock
View File

@@ -1360,10 +1360,10 @@
dependencies:
mkdirp "^1.0.4"
"@payloadcms/config-provider@0.0.7":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@payloadcms/config-provider/-/config-provider-0.0.7.tgz#c225f29cf1737e039c95bd54ba25be5e32550ae1"
integrity sha512-qiiz5i/BRPkU6wyBg01Cf5pikfYxudanIjONdpTx7Z4xaUN67OZ0SDCfRno5LGrUupsFgxlEfSIXFGWb9h4gdw==
"@payloadcms/config-provider@0.0.9":
version "0.0.9"
resolved "https://registry.yarnpkg.com/@payloadcms/config-provider/-/config-provider-0.0.9.tgz#b2f89bb64418b96c04ff8e08a7d39f82eb6fa281"
integrity sha512-M8Lgp7tw0uIIKSJ5MjLsP3yS5406cmUEWtdnH/zshq3uRNGYmvlg/hOmFl0pJpZdut9An+qCFVhvjSTaQAok/Q==
"@popperjs/core@^2.4.4":
version "2.5.4"