Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Popup do not hide when disabled is set #293 #1

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Popup do not hide when disabled is set #293 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 38 additions & 44 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
import React, {
useState,
useRef,
useEffect,
forwardRef,
useImperativeHandle,
forwardRef, useEffect, useImperativeHandle, useRef, useState
} from 'react';
import ReactDOM from 'react-dom';
import { PopupProps, PopupActions } from './types';
import {
useOnEscape,
useRepositionOnResize,
useOnClickOutside,
useTabbing,
useIsomorphicLayoutEffect,
useIsomorphicLayoutEffect, useOnClickOutside, useOnEscape,
useRepositionOnResize, useTabbing
} from './hooks';

import './index.css';

import styles from './styles';
import { PopupActions, PopupProps } from './types';
import calculatePosition from './Utils';



let popupIdCounter = 0;

const getRootPopup = () => {
Expand All @@ -38,8 +31,8 @@ export const Popup = forwardRef<PopupActions, PopupProps>(
(
{
trigger = null,
onOpen = () => {},
onClose = () => {},
onOpen = () => { },
onClose = () => { },
defaultOpen = false,
open = undefined,
disabled = false,
Expand Down Expand Up @@ -91,22 +84,26 @@ export const Popup = forwardRef<PopupActions, PopupProps>(

// for uncontrolled popup we need to sync isOpen with open prop
useEffect(() => {
if (typeof open === 'boolean') {
if (open) openPopup();
else closePopup();
if (!disabled) {
if (typeof open === 'boolean') {
if (open) openPopup();
else closePopup();
}
} else {
closePopup();
}
}, [open, disabled]);

const openPopup = (event?: React.SyntheticEvent) => {
if (isOpen || disabled) return;
if (isOpen) return;
setIsOpen(true);
setTimeout(() => onOpen(event), 0);
};

const closePopup = (
event?: React.SyntheticEvent | KeyboardEvent | TouchEvent | MouseEvent
) => {
if (!isOpen || disabled) return;
if (!isOpen) return;
setIsOpen(false);
if (isModal) (focusedElBeforeOpen.current as HTMLElement)?.focus();
setTimeout(() => onClose(event), 0);
Expand Down Expand Up @@ -247,14 +244,13 @@ export const Popup = forwardRef<PopupActions, PopupProps>(
: styles.popupContent.tooltip;

const childrenElementProps: any = {
className: `popup-content ${
className !== ''
? className
.split(' ')
.map(c => `${c}-content`)
.join(' ')
: ''
}`,
className: `popup-content ${className !== ''
? className
.split(' ')
.map(c => `${c}-content`)
.join(' ')
: ''
}`,
style: {
...popupContentStyle,
...contentStyle,
Expand Down Expand Up @@ -284,14 +280,13 @@ export const Popup = forwardRef<PopupActions, PopupProps>(
<div ref={arrowRef} style={styles.popupArrow}>
<svg
data-testid="arrow"
className={`popup-arrow ${
className !== ''
? className
.split(' ')
.map(c => `${c}-arrow`)
.join(' ')
: ''
}`}
className={`popup-arrow ${className !== ''
? className
.split(' ')
.map(c => `${c}-arrow`)
.join(' ')
: ''
}`}
viewBox="0 0 32 16"
style={{
position: 'absolute',
Expand All @@ -318,14 +313,13 @@ export const Popup = forwardRef<PopupActions, PopupProps>(
key="O"
data-testid="overlay"
data-popup={isModal ? 'modal' : 'tooltip'}
className={`popup-overlay ${
className !== ''
? className
.split(' ')
.map(c => `${c}-overlay`)
.join(' ')
: ''
}`}
className={`popup-overlay ${className !== ''
? className
.split(' ')
.map(c => `${c}-overlay`)
.join(' ')
: ''
}`}
style={{
...ovStyle,
...overlayStyle,
Expand Down