Compare commits

..

No commits in common. "748af6a14f0e40b9c07052d10c7a25b396916d68" and "1f21469bce7b8b4d65c56610326e1cbf33f9eae3" have entirely different histories.

10 changed files with 580 additions and 2484 deletions

View File

@ -1,6 +1,3 @@
// Implements WordPress JS Coding Standards
// https://developer.wordpress.org/coding-standards/wordpress-coding-standards/javascript/
{
"root": true,
"parser": "@typescript-eslint/parser",
@ -13,8 +10,7 @@
"extends": [
"plugin:react/recommended",
"plugin:jsx-a11y/recommended",
"plugin:jest/recommended",
"plugin:@typescript-eslint/recommended"
"plugin:jest/recommended"
],
"env": {
"browser": false,
@ -146,15 +142,13 @@
"message": "Translate function arguments must be string literals."
}
],
"no-shadow": "off",
"@typescript-eslint/no-shadow": ["error"],
"no-shadow": "error",
"no-undef": "error",
"no-undef-init": "error",
"no-unreachable": "error",
"no-unsafe-negation": "error",
"no-unused-expressions": "error",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": ["error"],
"no-unused-vars": "error",
"no-useless-computed-key": "error",
"no-useless-constructor": "error",
"no-useless-return": "error",

View File

@ -4,7 +4,6 @@
"private": true,
"main": "src/blocks.ts",
"scripts": {
"lint:js": "wp-scripts lint-js 'src/**/*{.js,.jsx,.ts,.tsx}'",
"build:js": "webpack --mode=production",
"build:sass": "sass src/styles:dist",
"build": "npm run build:js && npm run build:sass",

View File

@ -9,17 +9,17 @@ import { Spinner } from '@wordpress/components';
import { baseUrl } from '@/globals';
import { ReactComponent as CogIcon } from '@/assets/cogicon.svg';
interface IPreviewProps {
type PreviewProps = {
embedCode: string;
}
};
interface IPreviewState {
type PreviewState = {
uniqueId: string;
loading: boolean;
}
};
class PreviewForm extends React.Component<IPreviewProps, IPreviewState> {
constructor( props: IPreviewProps ) {
class PreviewForm extends React.Component<PreviewProps, PreviewState> {
constructor( props: any ) {
super( props );
// Generate a unique identifier, so that the embed script can be identified
@ -39,7 +39,7 @@ class PreviewForm extends React.Component<IPreviewProps, IPreviewState> {
}
// Force the embed script to load, which makes Iframes in the editor resize properly.
loadEmbedScript( callback?: () => void ) {
loadEmbedScript( callback?: Function ) {
const existingScript = document.getElementById( `cog-embed-script-${ this.state.uniqueId }` );
if ( ! existingScript ) {

View File

@ -5,14 +5,16 @@ import * as React from 'react';
import { Modal, FocusableIframe } from '@wordpress/components';
import { baseUrl } from '@/globals';
import { IForm } from '@/types';
interface IDialogProps {
setOpen: ( val: boolean ) => void;
onSelectForm: ( form: IForm ) => void;
setOpen: Function;
onSelectForm: Function;
}
class SelectDialog extends React.Component<IDialogProps> {
interface IDialogState {
}
class SelectDialog extends React.Component<IDialogProps, IDialogState> {
componentDidMount() {
window.addEventListener( 'message', this.handlePostMessage, false );
}

View File

@ -15,19 +15,18 @@ import { edit, external } from '@wordpress/icons';
import { useState } from '@wordpress/element';
import { BlockControls, InspectorControls } from '@wordpress/block-editor';
import { IBlockAttributes, EmbedMode, IForm } from '@/types';
import { BlockAttributes, EmbedMode } from '@/types';
import { baseUrl } from './globals';
import { ReactComponent as CogIcon } from '@/assets/cogicon.svg';
import SelectDialog from '@/components/select-dialog';
import PreviewForm from '@/components/preview-form';
const Edit: React.FC<BlockEditProps<IBlockAttributes>> = ( { attributes, setAttributes, className } ) => {
const Edit: React.FC<BlockEditProps<BlockAttributes>> = ( { attributes, setAttributes, className } ) => {
const [ selectDialogOpen, setSelectDialogOpen ] = useState( false );
const handleForm = ( form: IForm ) => {
const handleForm = ( form: { [key: string]: any } ) => {
setAttributes( {
orgId: form.orgId,
formId: form.formId,
seamlessEmbedCode: form.embedCodes.Seamless,
iframeEmbedCode: form.embedCodes.IFrame,

View File

@ -4,7 +4,7 @@
import { registerBlockType } from '@wordpress/blocks';
import { IBlockAttributes } from './types';
import { BlockAttributes } from './types';
/**
* Internal dependencies
@ -14,7 +14,7 @@ import Save from './save';
import { ReactComponent as CogIcon } from './assets/cogicon.svg';
registerBlockType<IBlockAttributes>( 'cognito-forms/cognito-embed', {
registerBlockType<BlockAttributes>( 'cognito-forms/cognito-embed', {
title: 'Cognito Forms',
icon: CogIcon,
description: 'Easily build powerful forms.',
@ -24,9 +24,6 @@ registerBlockType<IBlockAttributes>( 'cognito-forms/cognito-embed', {
html: false,
},
attributes: {
orgId: {
type: 'string',
},
formId: {
type: 'string',
},

View File

@ -2,9 +2,9 @@ import * as React from 'react';
import { BlockSaveProps } from '@wordpress/blocks';
import { EmbedMode, IBlockAttributes } from './types';
import { EmbedMode, BlockAttributes } from './types';
const Save: React.FC<BlockSaveProps<IBlockAttributes>> = ( { attributes: { formId, embedMode, seamlessEmbedCode, iframeEmbedCode } } ) => {
const Save: React.FC<BlockSaveProps<BlockAttributes>> = ( { attributes: { formId, embedMode, seamlessEmbedCode, iframeEmbedCode } } ) => {
let embedCode = '';
switch ( embedMode ) {

View File

@ -3,21 +3,10 @@ export enum EmbedMode {
IFrame,
}
export interface IBlockAttributes {
orgId: string;
export interface BlockAttributes {
formId: string;
iframeEmbedCode: string;
seamlessEmbedCode: string;
ampEmbedCode: string;
embedMode: EmbedMode;
}
export interface IForm {
orgId: string;
formId: string;
embedCodes: {
Seamless: string;
IFrame: string;
Amp: string;
}
}

2996
yarn.lock

File diff suppressed because it is too large Load Diff