@dvrd/dvr-controls 1.1.25 → 1.1.27

package/index.ts

@@ -11,32 +11,31 @@ import {fas} from '@fortawesome/free-solid-svg-icons';
 
 library.add(fab, far, fas);
 
-
-import ButtonController from "./src/js/button/buttonController";
-import CheckboxController from "./src/js/checkbox/checkboxController";
-import DialogController, {DialogActionShape} from "./src/js/dialog/dialogController";
-import InlineDialog from "./src/js/dialog/inlineDialog";
-import PasswordInput from "./src/js/input/password/passwordInput";
+import ButtonController from './src/js/button/buttonController';
+import CheckboxController from './src/js/checkbox/checkboxController';
+import DialogController, {type DialogActionShape} from './src/js/dialog/dialogController';
+import InlineDialog from './src/js/dialog/inlineDialog';
+import PasswordInput from './src/js/input/password/passwordInput';
 import PasswordRules from './src/js/input/password/passwordRules';
-import LoaderController from "./src/js/loader/loaderController";
-import SelectController from "./src/js/select/selectController";
-import SnackbarController from "./src/js/snackbar/snackbarController";
-import SwitchController from "./src/js/switch/switchController";
-import ThemeContextProvider, {ThemeShape} from "./src/js/util/controlContext";
-import NumberInput from "./src/js/input/number/numberInput";
-import Label, {BreakType, LabelType} from './src/js/label/label';
-import WithBackground from "./src/js/popup/withBackground";
-import OptionsMenu from "./src/js/optionsMenu/optionsMenu";
-import AwesomeIcon from "./src/js/icon/awesomeIcon";
+import LoaderController from './src/js/loader/loaderController';
+import SelectController from './src/js/select/selectController';
+import SnackbarController from './src/js/snackbar/snackbarController';
+import SwitchController from './src/js/switch/switchController';
+import ThemeContextProvider, {type ThemeShape} from './src/js/util/controlContext';
+import NumberInput from './src/js/input/number/numberInput';
+import Label, {type BreakType, type LabelType} from './src/js/label/label';
+import WithBackground from './src/js/popup/withBackground';
+import OptionsMenu from './src/js/optionsMenu/optionsMenu';
+import AwesomeIcon from './src/js/icon/awesomeIcon';
 import ColorPicker from './src/js/colorPicker/colorPicker';
 import CloseButton from './src/js/button/closeButton';
 import AnimatedTextField from './src/js/input/animated/animatedTextField';
-import DVRHeader, {HeaderItem} from './src/js/header/DVRHeader';
-import DateFieldController, {DateReturnType, DateType} from './src/js/input/date/dateFieldController';
+import DVRHeader, {type HeaderItem} from './src/js/header/DVRHeader';
+import DateFieldController, {type DateReturnType, type DateType} from './src/js/input/date/dateFieldController';
 import AsyncSelect from './src/js/select/async/asyncSelect';
 import InputControllerV2 from './src/js/input/v2/inputController_v2';
 import WithEvents from './src/js/events/withEvents';
-import AppNavigator from "./src/js/navigator/navigator";
+import AppNavigator from './src/js/navigator/navigator';
 import DVRHead from './src/js/head/DVRHead';
 import TopButton from './src/js/topButton/topButton';
 import DVRCarouselController from './src/js/carousel/DVRCarouselController';
@@ -45,20 +44,20 @@ import PDFTemplateCreator from './src/js/pdf/pdfTemplateCreator';
 import SidebarMenu from './src/js/sidebarMenu/sidebarMenu';
 import Info from './src/js/info/info';
 import Media from './src/js/media/media';
-import DvrdButton, {DvrdButtonProps} from './src/js/button/dvrdButton';
-import DvrdDatePicker, {DVRDDatePickerRef} from './src/js/date/dvrdDatePicker';
+import DvrdButton, {type DvrdButtonProps} from './src/js/button/dvrdButton';
+import DvrdDatePicker, {type DVRDDatePickerRef} from './src/js/date/dvrdDatePicker';
 import DvrdInputController from './src/js/textField/dvrdInputController';
 import DVRDNumberInput from './src/js/textField/dvrdNumberInput';
 import DVRDPasswordInput from './src/js/textField/dvrdPasswordInput';
 import Link from './src/js/link/link';
 import DvrdOptionsList from './src/js/optionsList/dvrdOptionsList';
 import DvrdSelectController from './src/js/select/dvrdSelectController';
-import DVRDGroupedSelect, { GroupedSelectRef } from './src/js/select/dvrdGroupedSelect';
+import DVRDGroupedSelect, {type GroupedSelectRef} from './src/js/select/dvrdGroupedSelect';
 import DVRDSwitch from './src/js/switch/dvrdSwitch';
 import DvrdHeaderController from './src/js/header/v2/dvrdHeaderController';
 import FileUpload from './src/js/fileUpload/fileUpload';
 import DvrdRadioController from './src/js/radio/dvrdRadioController';
-import MobileNavigation from "./src/js/navigation/mobileNavigation";
+import MobileNavigation from './src/js/navigation/mobileNavigation';
 import NumberString from './src/js/util/numberString';
 
 export {
@@ -122,7 +121,7 @@ export {
     ThemeShape,
     DvrdButtonProps,
     GroupedSelectRef,
-    NumberString,
+    NumberString
 };
 
 export * from './src/js/util/controlUtil';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.1.25",
+  "version": "1.1.27",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -10,6 +10,9 @@
     "type": "git",
     "url": "https://bitbucket.org/Naampie/dvr-controls/"
   },
+  "scripts": {
+    "build": "npm publish"
+  },
   "author": "Dave van Rijn",
   "license": "ISC",
   "browserslist": {

package/src/js/popup/withBackground.tsx

@@ -3,10 +3,10 @@
  */
 
 import './style/withBackground.scss';
+import classNames from 'classnames';
 
 import React, {CSSProperties, PropsWithChildren, useEffect, useMemo, useRef} from 'react';
-import classNames from 'classnames';
-import {escapePressed, hasHover} from "../util/controlUtil";
+import {escapePressed} from '../util/controlUtil';
 
 interface Props {
     onClickBackground?: Function,
@@ -39,7 +39,7 @@ export default function WithBackground(props: PropsWithChildren<Props>) {
     function _onClickBackground(evt: React.MouseEvent) {
         if (preventBackgroundClick) return;
         if (onClickBackground) onClickBackground(evt);
-        else if (!hasHover(contentRef.current)) onClose(evt);
+        else if (evt.target === evt.currentTarget) onClose(evt);
     }
 
     function onKeyDown(evt: KeyboardEvent) {