react-ui-basics 0.0.242 → 0.0.243

package/Modal.js

@@ -34,10 +34,11 @@ class Modal extends AbstractModal {
         const content = createRef();
         const props = propsGetter(that);
         const beforeClose = (e) => {
-            stopPropagation(e);
             const bc = getBeforeClose() || props().beforeClose;
-            if (!bc || bc(that.close, e))
+            if (!bc || bc(that.close, e)) {
+                stopPropagation(e);
                 that.close();
+            }
         };
         const shouldClose = (e) => {
             const isSameModal = __style(el()).zIndex == (zIndex - 1) + '';

package/Modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.js","sources":["./src/Modal.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"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"}
+{"version":3,"file":"Modal.js","sources":["./src/Modal.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"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"}

package/bundle.css

@@ -302,6 +302,24 @@
   position: absolute;
 }
 
+.DNDContainer .DroppableList .Draggable {
+  transform: unset;
+  transition: unset;
+  opacity: 1;
+}
+
+.DNDContainer .DroppableList .Draggable.dragged {
+  transition: unset !important;
+}
+
+.DNDContainer .DroppableList.hover .Draggable {
+  transition: transform 0.2s ease-in;
+}
+
+.DNDContainer .DroppableList.resetting .Draggable {
+  transition: transform 0.1s ease-in;
+}
+
 .ImageGallery {
   position: fixed;
   top: 0;
@@ -537,24 +555,6 @@
   font-size: 24px;
 }
 
-.DNDContainer .DroppableList .Draggable {
-  transform: unset;
-  transition: unset;
-  opacity: 1;
-}
-
-.DNDContainer .DroppableList .Draggable.dragged {
-  transition: unset !important;
-}
-
-.DNDContainer .DroppableList.hover .Draggable {
-  transition: transform 0.2s ease-in;
-}
-
-.DNDContainer .DroppableList.resetting .Draggable {
-  transition: transform 0.1s ease-in;
-}
-
 .Checkbox {
   position: relative;
   white-space: pre;
@@ -813,6 +813,19 @@
   height: 100%;
 }
 
+.CircleProgress {
+  width: 48px;
+  height: 48px;
+}
+
+.CircleProgress .line {
+  stroke-width: 2px;
+  stroke: black;
+  stroke-linecap: square;
+  fill: none;
+  transition: stroke-dashoffset 0.2s ease;
+}
+
 .DatePicker {
   position: relative;
 }
@@ -930,61 +943,6 @@
   background-color: #51adf6;
 }
 
-.CircleProgress {
-  width: 48px;
-  height: 48px;
-}
-
-.CircleProgress .line {
-  stroke-width: 2px;
-  stroke: black;
-  stroke-linecap: square;
-  fill: none;
-  transition: stroke-dashoffset 0.2s ease;
-}
-
-.DialogModal {
-  overflow: hidden;
-}
-
-.DialogModal .content {
-  top: 20vh;
-}
-
-.Dialog {
-  background-color: white;
-  min-width: 460px;
-  max-width: 40vw;
-  padding: 15px;
-}
-
-.Dialog .title {
-  margin-bottom: 15px;
-  padding: 20px 50px 0px 30px;
-  font-size: 1.25rem;
-  line-height: 2rem;
-  font-weight: 400;
-  letter-spacing: 0.0125em;
-}
-
-.Dialog .description {
-  color: rgba(0, 0, 0, 0.54);
-  font-size: 1rem;
-  line-height: 1.5rem;
-  font-weight: 400;
-  letter-spacing: 0.03125em;
-  margin-top: 20px;
-  padding: 0 24px 24px;
-}
-
-.Dialog > div.row {
-  margin-bottom: 15px;
-}
-
-.Dialog > div.row:last-child {
-  margin-bottom: 0;
-}
-
 .DNDContainer {
   position: relative;
 }
@@ -1017,64 +975,110 @@
   pointer-events: none;
 }
 
-.Dropzone {
-  position: relative;
+.ModalMenu {
+  position: absolute;
+  top: 10px;
+  right: 50px;
 }
 
-.Dropzone > .overlay {
+.ModalMenu .material-icons {
+  color: #818181;
+}
+
+.ModalMenu .Button.animated {
+  position: absolute;
+  transition: opacity 150ms ease-in, right 200ms ease-in;
+  opacity: 0;
+  right: 0;
+  top: 0;
+}
+
+.ModalMenu .Button.animated.mounting, .ModalMenu .Button.animated.mounted {
+  opacity: 1;
+}
+
+.ModalMenu .Button.animated.unmounting {
+  transition: opacity 100ms ease-out, right 200ms ease-out;
+}
+
+.ModalMenu .Button.active {
+  background: #EBEBEB;
+}
+
+.ModalMenu .separator {
+  height: 24px;
+  width: 1px;
+  background-color: #D9D9D9;
+  margin-left: 4px;
+}
+
+.FormUploadProgress {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
   bottom: 0;
-  background-color: #38ADC4;
-  z-index: 1;
-  opacity: 0;
-  transition: all 0.2s ease;
-  transition-delay: 100ms;
-  visibility: hidden;
+  background-color: rgba(255, 255, 255, 0.6);
+  z-index: 2;
+}
+
+.FormUploadProgress.animated.mounting, .FormUploadProgress.animated.mounted {
+  transition-delay: 500ms;
+}
+
+.FormUploadProgress .wrapper {
+  position: sticky;
+  top: 40%;
+  margin-top: 40%;
+  margin-left: 50%;
+  transform: translateX(-50%);
   display: flex;
+  flex-flow: column;
   justify-content: center;
   align-items: center;
 }
 
-.Dropzone > .overlay .drop {
-  border-radius: 4px;
-  border: 1px dashed #FFFFFF;
+.FormUploadProgress .wrapper .CircleProgress, .FormUploadProgress .wrapper .SpinningProgress {
   position: absolute;
-  top: 18px;
-  left: 18px;
-  right: 18px;
-  bottom: 18px;
+  width: 107px;
+  height: 107px;
+  top: 0;
+  left: 0;
+}
+
+.FormUploadProgress .wrapper .CircleProgress .line, .FormUploadProgress .wrapper .SpinningProgress .line {
+  stroke: #2196F3;
+}
+
+.FormUploadProgress .wrapper > .progress {
+  width: 107px;
+  height: 107px;
+  min-height: 107px;
   display: flex;
   justify-content: center;
   align-items: center;
-  font-weight: 500;
-  font-size: 18px;
-  color: #FFFFFF;
-}
-
-.Dropzone.dragging > .overlay {
-  opacity: 0.7;
-  visibility: visible;
-  transition-delay: 0s;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.25);
+  border-radius: 50%;
+  background: white;
+  position: relative;
 }
 
-.Dropzone.dragging > * {
-  pointer-events: none;
+.FormUploadProgress .wrapper > .progress > .value {
+  display: inline-block;
+  margin-top: 5px;
+  font-weight: bold;
+  line-height: 16px;
+  font-size: 13px;
+  text-align: center;
+  color: #818181;
 }
 
-.Dropzone > input.file {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-  cursor: pointer;
-  z-index: 1;
+.FormUploadProgress .wrapper .cancel {
+  min-width: 107px;
+  margin-top: 20px;
+  background-color: white;
+  color: #F96B5C;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.25);
 }
 
 .FilteredList {
@@ -1161,169 +1165,195 @@
   margin-bottom: 8px;
 }
 
-.FormUploadProgress {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  background-color: rgba(255, 255, 255, 0.6);
-  z-index: 2;
-}
-
-.FormUploadProgress.animated.mounting, .FormUploadProgress.animated.mounted {
-  transition-delay: 500ms;
+.DropFileInput {
+  flex-grow: 1;
 }
 
-.FormUploadProgress .wrapper {
-  position: sticky;
-  top: 40%;
-  margin-top: 40%;
-  margin-left: 50%;
-  transform: translateX(-50%);
+.DropFileInput .Dropzone {
+  border: 1px dashed #808080;
+  padding: 12px;
   display: flex;
-  flex-flow: column;
+  flex-flow: row nowrap;
   justify-content: center;
   align-items: center;
+  color: gray;
+  cursor: pointer;
+  border-radius: 3px;
+  font-weight: normal;
+  line-height: 22px;
+  font-size: 14px;
+  color: #7E7E7E;
+  max-width: 100%;
+  word-break: break-all;
+  word-break: break-word;
 }
 
-.FormUploadProgress .wrapper .CircleProgress, .FormUploadProgress .wrapper .SpinningProgress {
-  position: absolute;
-  width: 107px;
-  height: 107px;
-  top: 0;
-  left: 0;
-}
-
-.FormUploadProgress .wrapper .CircleProgress .line, .FormUploadProgress .wrapper .SpinningProgress .line {
-  stroke: #2196F3;
+.DropFileInput .Dropzone .icon.withText {
+  margin-right: 10px;
 }
 
-.FormUploadProgress .wrapper > .progress {
-  width: 107px;
-  height: 107px;
-  min-height: 107px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.25);
-  border-radius: 50%;
-  background: white;
-  position: relative;
+.DialogModal {
+  overflow: hidden;
 }
 
-.FormUploadProgress .wrapper > .progress > .value {
-  display: inline-block;
-  margin-top: 5px;
-  font-weight: bold;
-  line-height: 16px;
-  font-size: 13px;
-  text-align: center;
-  color: #818181;
+.DialogModal .content {
+  top: 20vh;
 }
 
-.FormUploadProgress .wrapper .cancel {
-  min-width: 107px;
-  margin-top: 20px;
+.Dialog {
   background-color: white;
-  color: #F96B5C;
-  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.25);
+  min-width: 460px;
+  max-width: 40vw;
+  padding: 15px;
 }
 
-.Button.FloatingActionButton {
-  position: absolute;
-  right: 16px;
-  bottom: 16px;
-  width: 56px;
-  height: 56px;
-  padding: 16px;
-  transition: bottom 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+.Dialog .title {
+  margin-bottom: 15px;
+  padding: 20px 50px 0px 30px;
+  font-size: 1.25rem;
+  line-height: 2rem;
+  font-weight: 400;
+  letter-spacing: 0.0125em;
 }
 
-.Button.FloatingActionButton.raised {
-  transition: bottom 0.2s cubic-bezier(0.4, 0, 0.2, 1), color 0.2s ease-out, background-color 0.2s ease-out, box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);
+.Dialog .description {
+  color: rgba(0, 0, 0, 0.54);
+  font-size: 1rem;
+  line-height: 1.5rem;
+  font-weight: 400;
+  letter-spacing: 0.03125em;
+  margin-top: 20px;
+  padding: 0 24px 24px;
 }
 
-.Button.FloatingActionButton.mini {
-  width: 40px;
-  height: 40px;
-  padding: 8px;
+.Dialog > div.row {
+  margin-bottom: 15px;
 }
 
-.Button.FloatingActionButton.hidden {
-  bottom: -100px;
+.Dialog > div.row:last-child {
+  margin-bottom: 0;
 }
 
-.Snackbar {
-  transform: translateX(-50%);
-  overflow: hidden;
-  background-color: #323232;
-  padding: 14px 24px 14px 24px;
-  color: #fff;
-  min-width: 288px;
-  max-width: 568px;
-  position: fixed;
-  bottom: -50px;
-  left: 50%;
+.Scrollable {
+  max-height: 250px;
+  max-width: 250px;
+  padding-right: 5px;
+  position: relative;
   display: flex;
-  flex-wrap: nowrap;
-  align-items: center;
-  opacity: 0;
-  transition: bottom 0.25s ease, opacity 0.2s ease;
-  border-radius: 4px;
-  box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+  flex-flow: column;
+  align-items: stretch;
+  overflow: hidden;
 }
 
-.Snackbar.shown {
-  bottom: 15px;
+.Scrollable:hover > .scrollbar.auto {
+  transition-delay: 0s;
   opacity: 1;
 }
 
-.Snackbar .message {
-  overflow: hidden;
-  line-height: 1.2em;
-  min-height: 1.2em;
-  max-height: 2.4em;
-  flex: 1;
+.Scrollable .viewport {
+  overflow-y: scroll;
+  overflow-x: scroll;
+  max-height: 100%;
+  scrollbar-width: none;
 }
 
-.Snackbar .action {
-  text-transform: uppercase;
-  font-weight: bold;
-  margin-left: 48px;
-  color: #bf3727;
+.Scrollable .viewport::-webkit-scrollbar {
+  display: none;
 }
 
-.Snackbar .action a {
-  text-decoration: none;
-  color: #bf3727;
+.Scrollable.without-scroll-horizontal {
+  max-width: unset;
 }
 
-.DropFileInput {
-  flex-grow: 1;
+.Scrollable.undefined-horizontal {
+  max-width: unset;
 }
 
-.DropFileInput .Dropzone {
-  border: 1px dashed #808080;
-  padding: 12px;
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: center;
-  align-items: center;
-  color: gray;
-  cursor: pointer;
-  border-radius: 3px;
-  font-weight: normal;
-  line-height: 22px;
-  font-size: 14px;
-  color: #7E7E7E;
-  max-width: 100%;
-  word-break: break-all;
-  word-break: break-word;
+.Scrollable.without-scroll {
+  padding-right: 0;
+  max-height: unset;
 }
 
-.DropFileInput .Dropzone .icon.withText {
-  margin-right: 10px;
+.Scrollable.without-scroll > .viewport {
+  padding-right: 0;
+  margin-right: 0;
+}
+
+.Scrollable.without-scroll > .scrollbar {
+  visibility: hidden;
+}
+
+.Scrollable .scrollbar {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  width: 5px;
+  transition: opacity 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  transition-delay: 0.5s;
+  z-index: 1;
+}
+
+.Scrollable .scrollbar.auto, .Scrollable .scrollbar.hidden {
+  opacity: 0;
+}
+
+.Scrollable .scrollbar .thumb {
+  background-color: rgba(0, 0, 0, 0.3);
+  width: 5px;
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  user-select: none;
+  will-change: top;
+  border-radius: 2px;
+}
+
+.Scrollable .scrollbar .thumb:hover {
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.Scrollable .scrollbar .thumb:active {
+  background-color: rgba(0, 0, 0, 0.7);
+}
+
+.Scrollable .scrollbar.horizontal {
+  left: 0px;
+  right: 0px;
+  height: 5px;
+  bottom: 0;
+  width: unset;
+  top: unset;
+}
+
+.Scrollable .scrollbar.horizontal .thumb {
+  height: 5px;
+  left: 0px;
+  bottom: 0px;
+  will-change: left;
+}
+
+.Button.FloatingActionButton {
+  position: absolute;
+  right: 16px;
+  bottom: 16px;
+  width: 56px;
+  height: 56px;
+  padding: 16px;
+  transition: bottom 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.Button.FloatingActionButton.raised {
+  transition: bottom 0.2s cubic-bezier(0.4, 0, 0.2, 1), color 0.2s ease-out, background-color 0.2s ease-out, box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.Button.FloatingActionButton.mini {
+  width: 40px;
+  height: 40px;
+  padding: 8px;
+}
+
+.Button.FloatingActionButton.hidden {
+  bottom: -100px;
 }
 
 .SpinningProgress {
@@ -1379,6 +1409,51 @@
     stroke-dashoffset: -53px;
   }
 }
+.Snackbar {
+  transform: translateX(-50%);
+  overflow: hidden;
+  background-color: #323232;
+  padding: 14px 24px 14px 24px;
+  color: #fff;
+  min-width: 288px;
+  max-width: 568px;
+  position: fixed;
+  bottom: -50px;
+  left: 50%;
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  opacity: 0;
+  transition: bottom 0.25s ease, opacity 0.2s ease;
+  border-radius: 4px;
+  box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+}
+
+.Snackbar.shown {
+  bottom: 15px;
+  opacity: 1;
+}
+
+.Snackbar .message {
+  overflow: hidden;
+  line-height: 1.2em;
+  min-height: 1.2em;
+  max-height: 2.4em;
+  flex: 1;
+}
+
+.Snackbar .action {
+  text-transform: uppercase;
+  font-weight: bold;
+  margin-left: 48px;
+  color: #bf3727;
+}
+
+.Snackbar .action a {
+  text-decoration: none;
+  color: #bf3727;
+}
+
 .TextField {
   position: relative;
   width: 100%;
@@ -1522,6 +1597,88 @@
   animation-name: shake;
 }
 
+.Switch {
+  display: inline-flex;
+  padding-top: 5px;
+}
+
+.Switch .switch-input {
+  display: none;
+}
+
+.Switch .switch-label {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  min-width: 38px;
+  height: 24px;
+  cursor: pointer;
+  font-weight: 500;
+  text-align: left;
+  user-select: none;
+  margin: 0;
+  padding: 0;
+  padding-left: 44px;
+  box-sizing: border-box;
+}
+
+.Switch .switch-label:before, .Switch .switch-label:after {
+  content: "";
+  box-sizing: border-box;
+  position: absolute;
+  margin: 0;
+  outline: 0;
+  top: 50%;
+  transform: translate(0, -50%);
+  transition: all 0.3s ease;
+}
+
+.Switch .switch-label:before {
+  left: 1px;
+  width: 34px;
+  height: 14px;
+  background-color: #9E9E9E;
+  border-radius: 8px;
+}
+
+.Switch .switch-label:after {
+  left: 0;
+  width: 20px;
+  height: 20px;
+  background-color: #FAFAFA;
+  border-radius: 50%;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.14), 0 2px 2px 0 rgba(0, 0, 0, 0.098), 0 1px 5px 0 rgba(0, 0, 0, 0.084);
+}
+
+.Switch .switch-label .toggle--on {
+  display: none;
+}
+
+.Switch .switch-label .toggle--off {
+  display: inline-block;
+}
+
+.Switch .switch-label .label {
+  margin-right: 5px;
+}
+
+.Switch .switch-input:checked + .switch-label:before {
+  background-color: #A5D6A7;
+}
+
+.Switch .switch-input:checked + .switch-label:after {
+  background-color: #4CAF50;
+  transform: translate(80%, -50%);
+}
+
+.Switch .switch-input:checked + .switch-label .toggle--on {
+  display: inline-block;
+}
+
+.Switch .switch-input:checked + .switch-label .toggle--off {
+  display: none;
+}
+
 .Modal {
   display: block;
   position: fixed;
@@ -1586,47 +1743,78 @@
   min-height: 10px;
 }
 
-.Modal > .content > .Button.close {
-  top: 10px;
-  right: 10px;
+.Modal > .content > .Button.close {
+  top: 10px;
+  right: 10px;
+  position: absolute;
+}
+
+.Dropzone {
+  position: relative;
+}
+
+.Dropzone > .overlay {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: #38ADC4;
+  z-index: 1;
+  opacity: 0;
+  transition: all 0.2s ease;
+  transition-delay: 100ms;
+  visibility: hidden;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.Dropzone > .overlay .drop {
+  border-radius: 4px;
+  border: 1px dashed #FFFFFF;
   position: absolute;
+  top: 18px;
+  left: 18px;
+  right: 18px;
+  bottom: 18px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 500;
+  font-size: 18px;
+  color: #FFFFFF;
 }
 
-.ModalMenu {
-  position: absolute;
-  top: 10px;
-  right: 50px;
+.Dropzone.dragging > .overlay {
+  opacity: 0.7;
+  visibility: visible;
+  transition-delay: 0s;
 }
 
-.ModalMenu .material-icons {
-  color: #818181;
+.Dropzone.dragging > * {
+  pointer-events: none;
 }
 
-.ModalMenu .Button.animated {
+.Dropzone > input.file {
   position: absolute;
-  transition: opacity 150ms ease-in, right 200ms ease-in;
-  opacity: 0;
+  left: 0;
   right: 0;
   top: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  cursor: pointer;
+  z-index: 1;
 }
 
-.ModalMenu .Button.animated.mounting, .ModalMenu .Button.animated.mounted {
-  opacity: 1;
-}
-
-.ModalMenu .Button.animated.unmounting {
-  transition: opacity 100ms ease-out, right 200ms ease-out;
-}
-
-.ModalMenu .Button.active {
-  background: #EBEBEB;
+.ScrollableTable .Scrollable .scrollbar {
+  top: 56px;
 }
 
-.ModalMenu .separator {
-  height: 24px;
-  width: 1px;
-  background-color: #D9D9D9;
-  margin-left: 4px;
+.ScrollableTable .Table {
+  position: static;
 }
 
 .Table {
@@ -1749,192 +1937,4 @@
 
 .Table .editable > .AutocompleteSelect > .selected > .DummyChild {
   margin: 0;
-}
-
-.Scrollable {
-  max-height: 250px;
-  max-width: 250px;
-  padding-right: 5px;
-  position: relative;
-  display: flex;
-  flex-flow: column;
-  align-items: stretch;
-  overflow: hidden;
-}
-
-.Scrollable:hover > .scrollbar.auto {
-  transition-delay: 0s;
-  opacity: 1;
-}
-
-.Scrollable .viewport {
-  overflow-y: scroll;
-  overflow-x: scroll;
-  max-height: 100%;
-  scrollbar-width: none;
-}
-
-.Scrollable .viewport::-webkit-scrollbar {
-  display: none;
-}
-
-.Scrollable.without-scroll-horizontal {
-  max-width: unset;
-}
-
-.Scrollable.undefined-horizontal {
-  max-width: unset;
-}
-
-.Scrollable.without-scroll {
-  padding-right: 0;
-  max-height: unset;
-}
-
-.Scrollable.without-scroll > .viewport {
-  padding-right: 0;
-  margin-right: 0;
-}
-
-.Scrollable.without-scroll > .scrollbar {
-  visibility: hidden;
-}
-
-.Scrollable .scrollbar {
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  width: 5px;
-  transition: opacity 0.2s cubic-bezier(0.4, 0, 0.2, 1);
-  transition-delay: 0.5s;
-  z-index: 1;
-}
-
-.Scrollable .scrollbar.auto, .Scrollable .scrollbar.hidden {
-  opacity: 0;
-}
-
-.Scrollable .scrollbar .thumb {
-  background-color: rgba(0, 0, 0, 0.3);
-  width: 5px;
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  user-select: none;
-  will-change: top;
-  border-radius: 2px;
-}
-
-.Scrollable .scrollbar .thumb:hover {
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.Scrollable .scrollbar .thumb:active {
-  background-color: rgba(0, 0, 0, 0.7);
-}
-
-.Scrollable .scrollbar.horizontal {
-  left: 0px;
-  right: 0px;
-  height: 5px;
-  bottom: 0;
-  width: unset;
-  top: unset;
-}
-
-.Scrollable .scrollbar.horizontal .thumb {
-  height: 5px;
-  left: 0px;
-  bottom: 0px;
-  will-change: left;
-}
-
-.ScrollableTable .Scrollable .scrollbar {
-  top: 56px;
-}
-
-.ScrollableTable .Table {
-  position: static;
-}
-
-.Switch {
-  display: inline-flex;
-  padding-top: 5px;
-}
-
-.Switch .switch-input {
-  display: none;
-}
-
-.Switch .switch-label {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  min-width: 38px;
-  height: 24px;
-  cursor: pointer;
-  font-weight: 500;
-  text-align: left;
-  user-select: none;
-  margin: 0;
-  padding: 0;
-  padding-left: 44px;
-  box-sizing: border-box;
-}
-
-.Switch .switch-label:before, .Switch .switch-label:after {
-  content: "";
-  box-sizing: border-box;
-  position: absolute;
-  margin: 0;
-  outline: 0;
-  top: 50%;
-  transform: translate(0, -50%);
-  transition: all 0.3s ease;
-}
-
-.Switch .switch-label:before {
-  left: 1px;
-  width: 34px;
-  height: 14px;
-  background-color: #9E9E9E;
-  border-radius: 8px;
-}
-
-.Switch .switch-label:after {
-  left: 0;
-  width: 20px;
-  height: 20px;
-  background-color: #FAFAFA;
-  border-radius: 50%;
-  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.14), 0 2px 2px 0 rgba(0, 0, 0, 0.098), 0 1px 5px 0 rgba(0, 0, 0, 0.084);
-}
-
-.Switch .switch-label .toggle--on {
-  display: none;
-}
-
-.Switch .switch-label .toggle--off {
-  display: inline-block;
-}
-
-.Switch .switch-label .label {
-  margin-right: 5px;
-}
-
-.Switch .switch-input:checked + .switch-label:before {
-  background-color: #A5D6A7;
-}
-
-.Switch .switch-input:checked + .switch-label:after {
-  background-color: #4CAF50;
-  transform: translate(80%, -50%);
-}
-
-.Switch .switch-input:checked + .switch-label .toggle--on {
-  display: inline-block;
-}
-
-.Switch .switch-input:checked + .switch-label .toggle--off {
-  display: none;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-ui-basics",
-  "version": "0.0.242",
+  "version": "0.0.243",
   "description": "",
   "module": "index.js",
   "_main": "index.cjs.js",

package/src/Modal.tsx

@@ -72,10 +72,11 @@ class Modal extends AbstractModal {
         const props = propsGetter(that);
 
         const beforeClose = (e) => {
-            stopPropagation(e);
             const bc = getBeforeClose() || props().beforeClose;
-            if (!bc || bc(that.close, e))
+            if (!bc || bc(that.close, e)) {
+                stopPropagation(e);
                 that.close();
+            }
         };
 
         const shouldClose = (e) => {