@antscorp/antsomi-ui 1.3.3-beta.60 → 1.3.3-beta.62

package/es/components/molecules/DatePicker/components/AdvancedPicker/AdvancedPicker.js

@@ -384,7 +384,7 @@ export const AdvancedPicker = props => {
                 React.createElement(Button, { type: "primary", onClick: () => onClickApply() }, "Apply"),
                 React.createElement(Button, { type: "default", onClick: () => toggleOpenDropdown(false) }, "Cancel")),
             option.dateType.value === 'fixed' && React.createElement(Button, { onClick: () => onClickNow() }, "Now"))));
-    const renderDateTypeOptions = () => (React.createElement(Select, { options: newDateTypes.map(dateType => (Object.assign(Object.assign({}, dateType), { label: t(dateType.label) }))), value: option.dateType.value, onChange: value => {
+    const renderDateTypeOptions = () => (React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentElement, options: newDateTypes.map(dateType => (Object.assign(Object.assign({}, dateType), { label: t(dateType.label) }))), value: option.dateType.value, onChange: value => {
             const dateType = newDateTypes.find(dateType => dateType.value === value);
             toggleOpenDropdown(true);
             setTimeout(() => {
@@ -453,7 +453,10 @@ export const AdvancedPicker = props => {
                             const newDate = getNewDate(item, index);
                             setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(newDate).format(format) })));
                         } }, item)))))) : (React.createElement(React.Fragment, null,
-                    React.createElement(Select, { options: newCalculationTypes.map(({ label, value }) => ({
+                    React.createElement(Select, { getPopupContainer: triggerNode => {
+                            console.log(triggerNode.parentNode);
+                            return triggerNode.parentNode;
+                        }, options: newCalculationTypes.map(({ label, value }) => ({
                             value,
                             label: t(label),
                         })), value: option.calculationType.value, onChange: value => {
@@ -461,7 +464,10 @@ export const AdvancedPicker = props => {
                             onChangeOption({ calculationType });
                         } }),
                     React.createElement(InputNumber, { value: option.value, style: { width: '100%' }, min: 0, showHandler: false, onChange: value => onChangeOption({ value }) }),
-                    React.createElement(Select, { options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
+                    React.createElement(Select, { getPopupContainer: triggerNode => {
+                            console.log(triggerNode.parentNode);
+                            return triggerNode.parentNode;
+                        }, options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
                             const calculationDate = newCalculationDates.find(calculationDate => calculationDate.value === value);
                             onChangeOption({ calculationDate });
                         } }))),

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuBlock.d.ts

@@ -5,6 +5,7 @@ export interface RichMenuBlockProps {
     richMenu: RichMenu;
     isPreview?: boolean;
     layerActive?: LayerActiveProps;
+    cellActiveIdx?: number;
     onClickCell?: (cellIdx: number) => void;
     onChange?: (richMenu: RichMenu, source?: 'user' | 'system') => void;
 }

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuBlock.js

@@ -8,7 +8,7 @@ import { RichMenuCell } from './RichMenuCell';
 import { tryCatchWrapper } from '@antscorp/antsomi-ui/es/utils';
 const PATH = 'src/app/modules/Dashboard/containers/RichMenu/containers/Design/components/Workspace/components/RichMenuBlock/index.tsx';
 export const RichMenuBlock = props => {
-    const { richMenu, layerActive, isPreview, onClickCell, onChange } = props;
+    const { richMenu, layerActive, cellActiveIdx, isPreview, onClickCell, onChange } = props;
     const { gridTemplateCols = [], gridTemplateRows = [], cells = [], uploadMode, image, layoutType, rows, cols, } = richMenu || {};
     const { imageUrl, imageStyles } = image || {};
     const grid = {
@@ -44,7 +44,7 @@ export const RichMenuBlock = props => {
             }
         }
     }, PATH);
-    const renderCell = (cellInfo, ctx) => (React.createElement(RichMenuCell, { context: ctx, isPreview: isPreview, layerActive: layerActive, cell: cellInfo, isSingleMode: isSingleUploadMode, onClick: handleClickCell }));
+    const renderCell = (cellInfo, ctx) => (React.createElement(RichMenuCell, { context: ctx, isPreview: isPreview, layerActive: layerActive, cellActiveIdx: cellActiveIdx, cell: cellInfo, isSingleMode: isSingleUploadMode, onClick: handleClickCell }));
     return (React.createElement(ResizeGrid, Object.assign({ grid: grid, isPreview: isPreview, containerStyle: imageStyles, isCompact: layoutType === 'compact', renderCell: renderCell, cellActiveStyle: { background: 'rgba(0, 95, 184, 0.5)' }, cellBorder: isSingleUploadMode ? '1px solid rgba(0, 95, 184, 1)' : '1px dotted #000000', onChange: handleGridChange }, Object.assign({}, (isSingleUploadMode && {
         image: imageUrl,
         imagePosition: imageStyles === null || imageStyles === void 0 ? void 0 : imageStyles.objectPosition,

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuCell/index.d.ts

@@ -5,6 +5,7 @@ interface RichMenuCellProps {
     context: number;
     isSingleMode: boolean;
     isPreview?: boolean;
+    cellActiveIdx?: number;
     layerActive?: LayerActiveProps;
     onClick: (index: number) => void;
 }

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuCell/index.js

@@ -23,7 +23,7 @@ import { translations } from '@antscorp/antsomi-ui/es/locales/translations';
 import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
 const PATH = 'src/app/modules/Dashboard/containers/RichMenu/containers/Design/components/Workspace/components/RichMenuCell';
 export const RichMenuCell = props => {
-    const { cell, context, layerActive = 'all', isSingleMode, isPreview, onClick } = props;
+    const { cell, context, layerActive = 'all', cellActiveIdx, isSingleMode, isPreview, onClick, } = props;
     const [videoState, setVideoState] = useState({
         status: 'idle',
     });
@@ -58,7 +58,7 @@ export const RichMenuCell = props => {
         }
     };
     const renderCellContent = (isShow, cellInfo) => {
-        if (!isShow || layerActive === 'video')
+        if (!isShow || (layerActive === 'video' && +context === cellActiveIdx))
             return null;
         const { image, active } = cellInfo;
         const { imageUrl, imageStyles } = image;
@@ -71,7 +71,9 @@ export const RichMenuCell = props => {
         return (React.createElement(CellImage, { active: active && !isPreview, src: imageUrl, imagePosition: objectPosition, imageSize: objectFit, style: restImageStyles }));
     };
     const renderVideoLayer = (action, cell) => {
-        if (!action || action.type !== 'video' || layerActive === 'image')
+        if (!action ||
+            action.type !== 'video' ||
+            (layerActive === 'image' && +context === cellActiveIdx))
             return null;
         const { previewImage, isAddLabel, videoUrl } = action;
         const { active } = cell;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.3-beta.60",
+  "version": "1.3.3-beta.62",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",