@modul/mbui 0.0.1-beta-pv-50520-a5f245c9 → 0.0.1-beta-pv-50528-f9e8be2e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modul/mbui",
-  "version": "0.0.1-beta-pv-50520-a5f245c9",
+  "version": "0.0.1-beta-pv-50528-f9e8be2e",
   "packageManager": "yarn@3.5.1",
   "main": "src/index.ts",
   "scripts": {
@@ -14,7 +14,8 @@
   ],
   "dependencies": {
     "react-datepicker": "4.16.0",
-    "react-imask": "7.1.3"
+    "react-imask": "7.1.3",
+    "react-modal": "3.16.1"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",

package/src/Popup/BaseModal.tsx

@@ -0,0 +1,60 @@
+import React, { FC, ReactNode } from 'react'
+import Modal from 'react-modal'
+
+//Заменить на interface
+type BaseModalProps = {
+	shouldCloseOnOverlayClick?: boolean
+	children: ReactNode
+	isOpen: boolean
+	appElement?: object
+	onAfterOpen?: () => void
+	onRequestClose?: () => void
+	overlayClassName?: string
+}
+
+const BaseModal: FC<BaseModalProps> = ({
+	shouldCloseOnOverlayClick = true,
+	children,
+	isOpen,
+	appElement,
+	onAfterOpen,
+	onRequestClose,
+	overlayClassName,
+}) => {
+	const handleOverlayOnClick = (event: React.MouseEvent) => {
+		if (shouldCloseOnOverlayClick) {
+			onRequestClose?.()
+		}
+	}
+
+	const preventEvents = (e: React.MouseEvent) => {
+		e.stopPropagation()
+	}
+
+	//TODO: для чего нужен AppElement
+	return (
+		<Modal
+			isOpen={isOpen}
+			contentLabel=""
+			appElement={appElement ?? undefined}
+			onRequestClose={onRequestClose}
+			shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+			onAfterOpen={onAfterOpen}
+			className="popup_table"
+			overlayClassName={`popup_overlay ${overlayClassName ?? ''}`}
+		>
+			<div
+				className="popup_cell"
+				onClick={preventEvents}
+			>
+				{children}
+				<div
+					className="popup_backdrop"
+					onClick={handleOverlayOnClick}
+				/>
+			</div>
+		</Modal>
+	)
+}
+
+export default BaseModal

package/src/Popup/Popup.tsx

@@ -0,0 +1,56 @@
+import React, { FC, ReactNode, useState, useEffect } from 'react'
+import BaseModal from './BaseModal'
+
+type BaseModalProps = {
+	shouldCloseOnOverlayClick?: boolean
+	children: ReactNode
+	isOpen: boolean
+	appElement?: object
+	onAfterOpen?: () => void
+	onRequestClose?: () => void
+	overlayClassName?: string
+	layerClassName: string
+	disableClose?: boolean
+}
+
+const Popup: FC<BaseModalProps> = ({
+	shouldCloseOnOverlayClick = true,
+	children,
+	isOpen,
+	appElement = document.getElementsByTagName('body')[0],
+	onAfterOpen,
+	onRequestClose,
+	overlayClassName,
+	layerClassName,
+	disableClose,
+	...props
+}) => {
+	const handleRequestClose = () => {
+		onRequestClose()
+	}
+
+	const classNames = ['popup_layer', layerClassName || ''].join(' ')
+
+	return (
+		<BaseModal
+			{...props}
+			isOpen={isOpen}
+			appElement={appElement}
+			onAfterOpen={onAfterOpen}
+			shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+			onRequestClose={handleRequestClose}
+		>
+			<div className={classNames}>
+				{!disableClose && (
+					<button
+						className="popup_close icon-close"
+						onClick={handleRequestClose}
+					/>
+				)}
+				{children}
+			</div>
+		</BaseModal>
+	)
+}
+
+export default Popup

package/src/Popup/index.ts

@@ -0,0 +1,3 @@
+import Popup from './Popup'
+
+export { Popup }

package/src/index.ts

@@ -2,6 +2,7 @@ import { Button } from './Base/Buttons'
 import { TextLink } from './Base/Links'
 import { DatePicker } from './DatePicker'
 import { Input } from './Base/Input'
-import { Checkbox } from './Base/Checkbox'
+//
+import { Popup } from './Popup'
 
-export { Button, TextLink, DatePicker, Input, Checkbox }
+export { Button, TextLink, DatePicker, Input, Popup }

package/src/Base/Checkbox/Checkbox.tsx

@@ -1,66 +0,0 @@
-import React, { FC, InputHTMLAttributes, ReactNode } from 'react'
-import classnames from 'classnames'
-interface ICheckbox extends InputHTMLAttributes<HTMLInputElement> {
-	switcher?: boolean
-	children?: ReactNode
-	childrenWrapperClassName?: string
-	labelClassName?: string
-	iconId?: string
-	onClick?: () => void
-	disabled?: boolean
-}
-
-const Checkbox: FC<ICheckbox> = ({
-	id,
-	name,
-	checked,
-	onChange,
-	onClick,
-	value = 'on',
-	switcher,
-	onBlur,
-	onFocus,
-	iconId,
-	children,
-	childrenWrapperClassName,
-	labelClassName,
-	disabled,
-}) => {
-	const labelClasses = classnames('label-check', labelClassName, { _switcher: switcher })
-
-	const renderIcon = iconId && (
-		<i
-			className="icon"
-			id={iconId}
-		/>
-	)
-
-	const renderChildren = children && <span className={childrenWrapperClassName}>{children}</span>
-
-	return (
-		<span onClick={onClick}>
-			<input
-				type="checkbox"
-				checked={checked}
-				name={name}
-				id={id}
-				onChange={onChange}
-				value={value}
-				onBlur={onBlur}
-				onFocus={onFocus}
-				disabled={disabled}
-			/>
-
-			<label
-				htmlFor={id}
-				className={labelClasses}
-				data-checked={checked}
-			>
-				{renderIcon}
-				{renderChildren}
-			</label>
-		</span>
-	)
-}
-
-export default Checkbox

package/src/Base/Checkbox/index.ts

@@ -1,3 +0,0 @@
-import Checkbox from './Checkbox'
-
-export { Checkbox }