fix(codeAreaComponent): update import path for CodeAreaModal to use v2 version
fix(codeAreaModal/v2): set open prop to true in TwoColumnsModal component fix(twoColumnsModal): add missing import statement for PopUpContext refactor(twoColumnsModal): remove unused code and add logic to close modal and reset state when modal is closed
This commit is contained in:
parent
27776f473f
commit
f6f471cc53
3 changed files with 12 additions and 8 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
import { useContext, useEffect, useState } from "react";
|
import { useContext, useEffect, useState } from "react";
|
||||||
import { PopUpContext } from "../../contexts/popUpContext";
|
import { PopUpContext } from "../../contexts/popUpContext";
|
||||||
import CodeAreaModal from "../../modals/codeAreaModal";
|
import CodeAreaModal from "../../modals/codeAreaModal/v2";
|
||||||
import TextAreaModal from "../../modals/textAreaModal";
|
import TextAreaModal from "../../modals/textAreaModal";
|
||||||
import { CodeAreaComponentType, TextAreaComponentType } from "../../types/components";
|
import { CodeAreaComponentType, TextAreaComponentType } from "../../types/components";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ export default function CodeAreaModal({
|
||||||
const tabs = [{ name: "code" }, { name: "errors" }]
|
const tabs = [{ name: "code" }, { name: "errors" }]
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TwoColumnsModal open={open} setOpen={setOpen}>
|
<TwoColumnsModal open={true} setOpen={setOpen}>
|
||||||
<TwoColumnsModal.Header description={CODE_PROMPT_DIALOG_SUBTITLE}>{"A"}</TwoColumnsModal.Header>
|
<TwoColumnsModal.Header description={CODE_PROMPT_DIALOG_SUBTITLE}>{"A"}</TwoColumnsModal.Header>
|
||||||
<TwoColumnsModal.First>{"A"}</TwoColumnsModal.First>
|
<TwoColumnsModal.First>{"A"}</TwoColumnsModal.First>
|
||||||
<TwoColumnsModal.Second>{"B"}</TwoColumnsModal.Second>
|
<TwoColumnsModal.Second>{"B"}</TwoColumnsModal.Second>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { ReactNode, useEffect, useRef } from "react";
|
import { ReactNode, useContext, useEffect, useRef } from "react";
|
||||||
|
|
||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
import {
|
import {
|
||||||
|
|
@ -10,6 +10,7 @@ import {
|
||||||
DialogTrigger,
|
DialogTrigger,
|
||||||
} from "../../components/ui/dialog";
|
} from "../../components/ui/dialog";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
import { PopUpContext } from "../../contexts/popUpContext";
|
||||||
|
|
||||||
type FirstProps = {children:ReactNode};
|
type FirstProps = {children:ReactNode};
|
||||||
type SecondProps = {children:ReactNode};
|
type SecondProps = {children:ReactNode};
|
||||||
|
|
@ -48,13 +49,16 @@ function TwoColumnsModal({
|
||||||
setOpen,
|
setOpen,
|
||||||
children,
|
children,
|
||||||
}: TwoColumnsModalProps) {
|
}: TwoColumnsModalProps) {
|
||||||
const isOpen = useRef(open);
|
const {closePopUp, setCloseEdit} = useContext(PopUpContext)
|
||||||
useEffect(() => {
|
|
||||||
isOpen.current = open;
|
|
||||||
}, [open]);
|
|
||||||
|
|
||||||
function setModalOpen(x: boolean) {
|
function setModalOpen(x: boolean) {
|
||||||
setOpen(x);
|
setOpen(x);
|
||||||
|
if (x === false) {
|
||||||
|
setTimeout(() => {
|
||||||
|
setCloseEdit("editcode");
|
||||||
|
closePopUp();
|
||||||
|
}, 300);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const firstChild = React.Children.toArray(children).find(
|
const firstChild = React.Children.toArray(children).find(
|
||||||
(child) => (child as React.ReactElement).type === First
|
(child) => (child as React.ReactElement).type === First
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue