@imposium-hub/components 2.5.10-8 → 2.5.10

package/src/components/confirm-modal/ConfirmModal.tsx

@@ -1,24 +1,85 @@
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
-import { useHotkeys } from 'react-hotkeys-hook';
 import Modal from '../modal/Modal';
 import Button from '../button/Button';
 import { confirm as copy } from '../../constants/copy';
 import Section from '../section/Section';
 
-export const ConfirmModal = ({
-    onClose,
-    onYes,
-    onNo,
-    title,
-    onYesLabel,
-    onNoLabel,
-    showCancel
-}) => {
-    useHotkeys('enter', onYes, { enableOnFormTags: true });
-    const { cancel } = copy;
+export interface IConfirmModalProps {
+    onYes: () => void;
+    onNo?: () => void;
+    title: string;
+    yesLabel?: string;
+    noLabel?: string;
+    showCancel?: boolean;
+}
 
-    const modal = (
+export const ConfirmModal = () => {
+    const [props, setProps] = useState<IConfirmModalProps>(null);
+    const [isOpen, setIsOpen] = useState<boolean>(false);
+
+    const onOpen = (event) => {
+        setProps({
+            ...event.detail
+        });
+        setIsOpen(true);
+    };
+
+    const onClose = () => setIsOpen(false);
+
+    const onYesHandler = () => {
+        props.onYes();
+        setIsOpen(false);
+    };
+
+    const onNoHandler = () => {
+        props.onNo();
+        setIsOpen(false);
+    };
+
+    const onYes = useCallback(() => onYesHandler(), [isOpen]);
+
+    const onNo = useCallback(() => {
+        if (props.onNo) {
+            onNoHandler();
+        } else {
+            onClose();
+        }
+    }, [isOpen]);
+
+    const onKeyDown = useCallback(
+        (e) => {
+            if (e.key === 'Enter') {
+                e.preventDefault();
+                onYesHandler();
+            }
+        },
+        [isOpen]
+    );
+
+    useEffect(() => {
+        window.addEventListener('openconfirmmodal', onOpen);
+        return () => {
+            window.removeEventListener('openconfirmmodal', onOpen);
+        };
+    }, []);
+
+    useEffect(() => {
+        if (isOpen) {
+            document.addEventListener('keypress', onKeyDown);
+        } else {
+            document.removeEventListener('keypress', onKeyDown);
+        }
+        return () => {
+            document.removeEventListener('keypress', onKeyDown);
+        };
+    }, [isOpen, onKeyDown]);
+
+    const { cancel, yes, no } = copy;
+    const noLabel = props?.noLabel ? props.noLabel : no;
+    const yesLabel = props?.yesLabel ? props.yesLabel : yes;
+
+    const modal = isOpen && (
         <Modal
             onRequestClose={onClose}
             wrapperStyle={{
@@ -27,16 +88,16 @@ export const ConfirmModal = ({
             }}
             style={{
                 width: '400px',
-                height: '12%',
+                height: '14%',
                 top: 'calc(50% - 150px)',
                 left: 'calc((100% - 400px) / 2)'
             }}
             isOpen={true}>
             <Section>
                 <div className='confirm-modal'>
-                    <p>{title}</p>
+                    <p>{props.title}</p>
                     <div className='confirm-buttons'>
-                        {showCancel ? (
+                        {props.showCancel ? (
                             <Button
                                 onClick={onClose}
                                 size='large'
@@ -48,14 +109,14 @@ export const ConfirmModal = ({
                             onClick={onNo}
                             size='large'
                             color='default'>
-                            {onNoLabel}
+                            {noLabel}
                         </Button>
                         <Button
                             onClick={onYes}
                             size='large'
                             style='bold'
                             color='primary'>
-                            {onYesLabel}
+                            {yesLabel}
                         </Button>
                     </div>
                 </div>

package/src/components/data-table/Paginator.tsx

@@ -26,149 +26,102 @@ const Paginator: React.FC<any> = ({
     setPageSize,
     itemsPerPage,
     onItemsPerPage
-}) => {
-    const [getPageIndex, setPageIndex] = React.useState<number>(pageIndex);
-    const [getItemsPerPage, setItemsPerPage] = React.useState<number>(itemsPerPage);
-
-    React.useEffect(() => {
-        if (pageIndex !== getPageIndex) {
-            setPageIndex(pageIndex);
-        }
-    }, [pageIndex]);
-
-    const onItemsPerPageBlur = () => {
-        clearTimeout(textInputTimeout);
-        onItemsPerPage(getItemsPerPage);
-    };
-
-    const onGoToPageBlur = () => {
-        clearTimeout(textInputTimeout);
-        gotoPage(getPageIndex, pageSize);
-    };
-
-    const onItemsPerPageKeyDown = (e) => {
-        if (e.key === 'Enter') {
-            clearTimeout(textInputTimeout);
-            onItemsPerPage(getItemsPerPage);
-        }
-    };
-
-    const onGoToPageKeyDown = (e) => {
-        if (e.key === 'Enter') {
-            clearTimeout(textInputTimeout);
-            gotoPage(getPageIndex, pageSize);
-        }
-    };
-
-    return (
-        <section className='ip-table-pagination'>
+}) => (
+    <section className='ip-table-pagination'>
+        <span>
+            <Button
+                style='subtle'
+                size='small'
+                tooltip='Go to first page'
+                disabled={!canPreviousPage}
+                onClick={() => gotoPage(1, pageSize)}>
+                {ICON_ANGLE_DOUBLE_LEFT}
+            </Button>
+            <Button
+                style='subtle'
+                size='small'
+                tooltip='Go to previous page'
+                disabled={!canPreviousPage}
+                onClick={() => previousPage()}>
+                {ICON_ANGLE_LEFT}
+            </Button>
+            <Button
+                style='subtle'
+                size='small'
+                tooltip='Go to next page'
+                disabled={!canNextPage}
+                onClick={() => nextPage()}>
+                {ICON_ANGLE_RIGHT}
+            </Button>
+            <Button
+                style='subtle'
+                size='small'
+                tooltip='Go to last page'
+                disabled={!canNextPage}
+                onClick={() => gotoPage(pageCount, pageSize)}>
+                {ICON_ANGLE_DOUBLE_RIGHT}
+            </Button>
+            &nbsp;&nbsp;
             <span>
-                <Button
-                    style='subtle'
-                    size='small'
-                    tooltip='Go to first page'
-                    disabled={!canPreviousPage}
-                    onClick={() => gotoPage(1, pageSize)}>
-                    {ICON_ANGLE_DOUBLE_LEFT}
-                </Button>
-                <Button
-                    style='subtle'
-                    size='small'
-                    tooltip='Go to previous page'
-                    disabled={!canPreviousPage}
-                    onClick={() => previousPage()}>
-                    {ICON_ANGLE_LEFT}
-                </Button>
-                <Button
-                    style='subtle'
-                    size='small'
-                    tooltip='Go to next page'
-                    disabled={!canNextPage}
-                    onClick={() => nextPage()}>
-                    {ICON_ANGLE_RIGHT}
-                </Button>
-                <Button
-                    style='subtle'
-                    size='small'
-                    tooltip='Go to last page'
-                    disabled={!canNextPage}
-                    onClick={() => gotoPage(pageCount, pageSize)}>
-                    {ICON_ANGLE_DOUBLE_RIGHT}
-                </Button>
-                &nbsp;&nbsp;
-                <span>
-                    {copy.table.page}&nbsp;&nbsp;
-                    <strong>
-                        {getPageIndex} of {pageCount}
-                    </strong>
-                    &nbsp;&nbsp;
-                </span>
-                <span>
-                    {copy.table.goToPage}&nbsp;&nbsp;
-                    <input
-                        className='paginator-input'
-                        type='number'
-                        placeholder={getPageIndex.toString()}
-                        onChange={(e) => {
-                            const input = e.target.value;
-                            const inputNum = Number(input);
-                            let next: number;
-
-                            clearTimeout(textInputTimeout);
-
-                            if (!input || inputNum < 1 || inputNum > pageCount) {
-                                return;
-                            }
-
-                            if (inputNum >= 1 && inputNum <= pageCount) {
-                                next = inputNum;
-                            }
-
-                            textInputTimeout = window.setTimeout(
-                                () => gotoPage(next, pageSize),
-                                1000
-                            );
-                        }}
-                        onBlur={() => onGoToPageBlur()}
-                        onKeyDown={(e) => onGoToPageKeyDown(e)}
-                    />
-                </span>
+                {copy.table.page}&nbsp;&nbsp;
+                <strong>
+                    {pageIndex} of {pageCount}
+                </strong>
                 &nbsp;&nbsp;
-                <span>
-                    {copy.table.itemsPerPage}&nbsp;&nbsp;
-                    <input
-                        className='paginator-input'
-                        type='number'
-                        placeholder={getItemsPerPage.toString()}
-                        min={1}
-                        onChange={(e) => {
-                            const input = e.target.value;
-                            const inputNum = Number(input);
-
-                            clearTimeout(textInputTimeout);
-
-                            if (!input || inputNum < 1) {
-                                return;
-                            }
-
-                            setItemsPerPage(inputNum);
-
-                            textInputTimeout = window.setTimeout(
-                                () => onItemsPerPage(inputNum),
-                                1000
-                            );
-                        }}
-                        onBlur={() => onItemsPerPageBlur()}
-                        onKeyDown={(e) => onItemsPerPageKeyDown(e)}
-                    />
-                </span>
             </span>
-
-            <span className='total-assets'>
-                {copy.table.total}&nbsp;&nbsp;<strong>{totalItems || 0}</strong>
+            <span>
+                {copy.table.goToPage}&nbsp;&nbsp;
+                <input
+                    className='paginator-input'
+                    type='number'
+                    placeholder={pageIndex}
+                    onChange={(e) => {
+                        const input = e.target.value;
+                        const inputNum = Number(input);
+                        let next: number;
+
+                        clearTimeout(textInputTimeout);
+
+                        if (!input || inputNum < 1 || inputNum > pageCount) {
+                            return;
+                        }
+
+                        if (inputNum >= 1 && inputNum <= pageCount) {
+                            next = inputNum;
+                        }
+
+                        textInputTimeout = window.setTimeout(() => gotoPage(next, pageSize), 300);
+                    }}
+                />
             </span>
-        </section>
-    );
-};
+            &nbsp;&nbsp;
+            <span>
+                {copy.table.itemsPerPage}&nbsp;&nbsp;
+                <input
+                    className='paginator-input'
+                    type='number'
+                    placeholder={itemsPerPage}
+                    min={1}
+                    onChange={(e) => {
+                        const input = e.target.value;
+                        const inputNum = Number(input);
+
+                        clearTimeout(textInputTimeout);
+
+                        if (!input || inputNum < 1) {
+                            return;
+                        }
+
+                        textInputTimeout = window.setTimeout(() => onItemsPerPage(inputNum), 300);
+                    }}
+                />
+            </span>
+        </span>
+
+        <span className='total-assets'>
+            {copy.table.total}&nbsp;&nbsp;<strong>{totalItems || 0}</strong>
+        </span>
+    </section>
+);
 
 export default Paginator;

package/src/components/story-previewer/StoryPreviewer.tsx

@@ -1,6 +1,11 @@
 import * as React from 'react';
 import { IImposiumAPI } from '../../services/API';
-import { VARIABLE_TYPES, BOOLEAN_DEFAULT_OPTIONS } from '../../constants/variables';
+import {
+    VARIABLE_TYPES,
+    BOOLEAN_DEFAULT_OPTIONS,
+    colorPresets,
+    formatColor
+} from '../../constants/variables';
 import { OUTPUT_TYPES } from '../../constants/previewer';
 import TextField from '../text-field/TextField';
 import Button from '../button/Button';
@@ -23,6 +28,7 @@ import LogViewer from '../log-viewer/LogViewer';
 import { connect } from 'react-redux';
 import { ICON_DOWNLOAD, ICON_CLIPBOARD } from '../../constants/icons';
 import AudioPlayer from '../players/AudioPlayer';
+import ColorField from '../color-field/ColorField';
 
 interface IStoryPreviewerProps {
     api: IImposiumAPI;
@@ -137,15 +143,14 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
         const { variables } = this.props;
         const inventoryOverrides = this.props.editor?.inventoryOverrides;
         const newInv = {};
-
         for (const i in variables) {
             if (variables.hasOwnProperty(i)) {
                 const override = inventoryOverrides ? inventoryOverrides[i] : null;
                 const inv = variables[i];
-                newInv[inv.id] = override ? override : this.getVariableValue(inv.previewItem);
+                newInv[inv.id] =
+                    override !== null ? override : this.getVariableValue(inv.previewItem);
             }
         }
-
         return newInv;
     }
 
@@ -230,6 +235,11 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
         }
     }
 
+    private colorInputChanged(key, value) {
+        const color = formatColor(value);
+        this.variableInputChanged(key, color);
+    }
+
     private variableInputChanged(key, value) {
         const inventory = { ...this.state.inventory };
         inventory[key] = value;
@@ -397,6 +407,20 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                             </FieldWrapper>
                         );
                         break;
+                    case VARIABLE_TYPES.COLOR:
+                        const value = inventory[inv.id] ? inventory[inv.id] : 'rgba(0,0,0,1)';
+                        fields.push(
+                            <ColorField
+                                label={inv.name}
+                                labelPosition='top'
+                                enableAlpha={true}
+                                presetColors={colorPresets}
+                                value={value}
+                                pickerPosition='bottom'
+                                onChange={(v) => this.colorInputChanged(inv.id, v)}
+                            />
+                        );
+                        break;
                 }
             }
         }

package/src/constants/copy.ts

@@ -273,7 +273,7 @@ export const copying: any = {
 };
 
 export const confirm: any = {
-    yes: 'Save',
-    no: "Don't Save",
+    yes: 'Yes',
+    no: 'No',
     cancel: 'Cancel'
 };

package/src/constants/icons.tsx

@@ -74,6 +74,7 @@ import {
 import { faCircleSmall } from '@fortawesome/pro-solid-svg-icons/faCircleSmall';
 import { faClapperboardPlay } from '@fortawesome/pro-solid-svg-icons/faClapperboardPlay';
 import { faCloudArrowUp, faFilters } from '@fortawesome/pro-solid-svg-icons';
+import { faCircleExclamation } from '@fortawesome/free-solid-svg-icons';
 
 export const ICON_VIDEO = <FontAwesomeIcon icon={faVideo} />;
 
@@ -220,3 +221,5 @@ export const ICON_CODE = <FontAwesomeIcon icon={faCode} />;
 export const ICON_UP_RIGHT_FROM_SQUARE = <FontAwesomeIcon icon={faUpRightFromSquare} />;
 
 export const ICON_FILE_UPLOAD = <FontAwesomeIcon icon={faCloudArrowUp} />;
+
+export const ICON_FILE_ERROR = <FontAwesomeIcon icon={faCircleExclamation} />;

package/src/constants/variables.ts

@@ -5,7 +5,8 @@ export const VARIABLE_TYPES = {
     ENUM: 'enum',
     IMAGE: 'image',
     VIDEO: 'video',
-    AUDIO: 'audio'
+    AUDIO: 'audio',
+    COLOR: 'color'
 };
 
 export const BOOLEAN_DEFAULT_OPTIONS = [
@@ -18,3 +19,28 @@ export const BOOLEAN_DEFAULT_OPTIONS = [
         label: 'False'
     }
 ];
+
+export const colorPresets = [
+    '#D0021B',
+    '#F5A623',
+    '#F8E71C',
+    '#8B572A',
+    '#7ED321',
+    '#417505',
+    '#BD10E0',
+    '#9013FE',
+    '#4A90E2',
+    '#50E3C2',
+    '#B8E986',
+    '#000000',
+    '#4A4A4A',
+    '#9B9B9B',
+    '#FFFFFF',
+    'transparent'
+];
+
+export const formatColor = (color) => {
+    const { r, g, b, a } = color.rgb;
+    const alpha = color.source === 'hsv' ? 1 : a;
+    return `rgba(${r},${g},${b},${alpha})`;
+};

package/src/index.ts

@@ -158,7 +158,7 @@ import ContextMenuItem from './components/context-menu/ContextMenuItem';
 import ContextMenuTrigger from './components/context-menu/ContextMenuTrigger';
 import CopyPropIdButton from './components/copy-prop-id-button/CopyPropIdButton';
 import Submenu from './components/context-menu/SubMenu';
-import { ConfirmModal } from './components/confirm-modal/ConfirmModal';
+import { ConfirmModal, IConfirmModalProps } from './components/confirm-modal/ConfirmModal';
 
 export {
     AppWrapper,
@@ -313,5 +313,6 @@ export {
     ContextMenuTrigger,
     Submenu,
     CopyPropIdButton,
-    ConfirmModal
+    ConfirmModal,
+    IConfirmModalProps
 };

package/src/redux/actions/asset-list.ts

@@ -83,7 +83,6 @@ export const deleteAssets = (api: IImposiumAPI, ids: string[], storyId: string):
             api.deleteAssets(ids)
                 .then(() => {
                     dispatch(getAssets(api, storyId));
-                    dispatch(toggleLoading(false));
                     resolve(true);
                 })
                 .catch((errors: Error[]) => {

package/src/redux/actions/asset-uploads.ts

@@ -7,7 +7,8 @@ const assetUploadsActions: any = {
     UPDATE_UPLOAD: 'assetUploads/UPDATE_UPLOAD',
     UPDATE_PERCENT_UPLOADED: 'assetUploads/UPDATE_PERCENT_UPLOADED',
     ADD_UPLOAD_ASSET_ID: 'assetUploads/ADD_UPLOAD_ASSET_ID',
-    REMOVE_UPLOAD: 'assetUploads/REMOVE_UPLOAD'
+    REMOVE_UPLOAD: 'assetUploads/REMOVE_UPLOAD',
+    ERROR: 'assetUploads/ERROR'
 };
 
 const POLL_INTERVAL: number = 5000;
@@ -241,6 +242,15 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
                         if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
                             currentQueue = currentQueue + 1;
                             createPromise(currentQueue);
+                        } else {
+                            const error: any = { ...e };
+                            const errorMsg = error.response.data.error.split(':')[0];
+                            dispatch({
+                                type: assetUploadsActions.ERROR,
+                                filename: uploadBlobs[activeIndex].filename,
+                                errorMsg
+                            });
+                            doAssetTableHydration(api, storyId);
                         }
                     });
             }
@@ -354,6 +364,15 @@ export const replaceAsset = (
                         if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
                             currentQueue = currentQueue + 1;
                             createPromise(currentQueue);
+                        } else {
+                            const error: any = { ...e };
+                            const errorMsg = error.response.data.error.split(':')[0];
+                            dispatch({
+                                type: assetUploadsActions.ERROR,
+                                filename: replacedFileBlobs[activeIndex].filename,
+                                errorMsg
+                            });
+                            doAssetTableHydration(api, storyId);
                         }
                     });
             };

package/src/redux/reducers/asset-uploads.ts

@@ -47,6 +47,17 @@ const assetUploads = (state = initialState, action): any => {
                 ...state,
                 uploads: state.uploads.filter((u: any) => u.filename !== action.filename)
             };
+        case assetUploadsActions.ERROR:
+            const newError = state.uploads.map((u: any) => {
+                if (u.filename === action.filename) {
+                    return { ...u, error: action.errorMsg };
+                }
+                return u;
+            });
+            return {
+                ...state,
+                uploads: newError
+            };
         default:
             return state;
     }

package/src/services/API.ts

@@ -153,6 +153,9 @@ interface ITTSOptions {
     voice: string;
     service: string;
     model?: string;
+    speed?: string;
+    pause_silences?: boolean;
+    minimum_silence_length?: number;
 }
 
 interface ICancelTokenCache {
@@ -1607,6 +1610,18 @@ export default class API {
             url += `&model=${options.model}`;
         }
 
+        if (options.speed) {
+            url += `&speed=${options.speed}`;
+        }
+
+        if (options.pause_silences) {
+            url += `&pause_silences=${options.pause_silences}`;
+        }
+
+        if (options.minimum_silence_length) {
+            url += `&minimum_silence_length=${options.minimum_silence_length}`;
+        }
+
         return this.doRequest({
             url,
             method: 'GET',