funda-ui 4.4.35 → 4.5.12

package/lib/cjs/Tree/index.js

@@ -1275,6 +1275,7 @@ function TreeList(props) {
   function handleCollapse(e) {
     if (disableCollapse) return;
     e.preventDefault();
+    e.stopPropagation();
     var hyperlink = e.currentTarget;
     var url = hyperlink.getAttribute('href');
     var subElement = (0,dom.getNextSiblings)(hyperlink, 'ul');
@@ -1325,6 +1326,7 @@ function TreeList(props) {
   }
   function handleSelect(e) {
     e.preventDefault();
+    e.stopPropagation();
     var hyperlink = e.currentTarget;
     if (hyperlink.classList.contains('selected')) {
       activeClass(hyperlink, 'remove', 'selected');

package/lib/cjs/Utils/inputsCalculation.d.ts

@@ -1,3 +1,20 @@
+/**
+ * Gets the relative upside of the text
+ * @param {Element} el    - A DOM node containing one selector to match against.
+ * @returns {Number}      - Returns a pure number.
+ */
+declare function getTextTop(el: HTMLElement): number;
+/**
+* Get the actual value with user specific methed
+* it can be 'width', 'height', 'outerWidth', 'outerHeight'
+* @private
+* @param {Element} el           - A DOM node containing one selector to match against.
+* @param {String} prop          - A string naming the property of style.
+* @param {?Json} config         - Whether or not margin is included. The key `includeMargin`
+                                    takes effect when set to true
+* @return {Number}              - Returns a pure number.
+*/
+declare function actualPropertyValue(el: any, prop: string, config?: any): any;
 /**
  * Get cursor or text position in pixels for input element
  *
@@ -7,4 +24,4 @@
  * @returns {Number}
  */
 declare function getTextWidth(input: HTMLInputElement, fauxContainer: HTMLSpanElement, rawTextContainer: HTMLElement): any;
-export { getTextWidth };
+export { getTextTop, actualPropertyValue, getTextWidth };

package/lib/cjs/Utils/inputsCalculation.js

@@ -46,8 +46,25 @@ return /******/ (() => { // webpackBootstrap
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "actualPropertyValue": () => (/* binding */ actualPropertyValue),
+/* harmony export */   "getTextTop": () => (/* binding */ getTextTop),
 /* harmony export */   "getTextWidth": () => (/* binding */ getTextWidth)
 /* harmony export */ });
+/**
+ * Gets the relative upside of the text
+ * @param {Element} el    - A DOM node containing one selector to match against.
+ * @returns {Number}      - Returns a pure number.
+ */
+function getTextTop(el) {
+  var styles = window.getComputedStyle(el);
+  var fontSize = parseFloat(styles.fontSize);
+  var lineHeight = parseFloat(styles.lineHeight) || fontSize;
+  var paddingTop = parseFloat(styles.paddingTop);
+  var borderWidth = parseFloat(styles.borderWidth);
+  var textTop = paddingTop + (lineHeight - fontSize) / 2 - borderWidth * 2;
+  return textTop;
+}
+
 /**
 * Get the actual value with user specific methed
 * it can be 'width', 'height', 'outerWidth', 'outerHeight'
@@ -73,6 +90,15 @@ function actualPropertyValue(el, prop) {
     marginWidth = parseFloat(style.marginLeft) + parseFloat(style.marginRight);
     marginHeight = parseFloat(style.marginTop) + parseFloat(style.marginBottom);
   }
+  if (prop === 'fontSize') {
+    actualVal = parseFloat(style.fontSize);
+  }
+  if (prop === 'fontFamily') {
+    actualVal = style.fontFamily;
+  }
+  if (prop === 'letterSpacing') {
+    actualVal = style.letterSpacing;
+  }
   if (prop === 'width') {
     maxVal = parseFloat(style.maxWidth);
 

package/lib/esm/EventCalendar/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo, useImperativeHandle } from 'react';
+import React, { useState, useRef, useEffect, useMemo, useImperativeHandle } from 'react';
 
 import { getTodayDate, getCalendarDate, isValidDate, padZero  } from 'funda-utils/dist/cjs/date';
 import { clsWrite, combinedCls } from 'funda-utils/dist/cjs/cls';
@@ -156,6 +156,8 @@ const EventCalendar = (props: EventCalendarProps) => {
     const [winMonth, setWinMonth] = useState<boolean>(false);
 
     // modal dialog
+    const modalEditHandleRef = useRef<any>();
+    const modalDeleteHandleRef = useRef<any>();
     const EVENTS_ENABLED = typeof modalContent !== 'undefined';
     const EVENTS_DELETE_ENABLED = typeof modalDeleteContent !== 'undefined';
     const [showEdit, setShowEdit] = useState<boolean>(false);
@@ -185,11 +187,9 @@ const EventCalendar = (props: EventCalendarProps) => {
     useImperativeHandle(
         contentRef,
         () => ({
-            gridInit: () => {
-
-            },
-            gridReset: (cb?: any) => {
-
+            closeModal: () => {
+                if (modalEditHandleRef.current) modalEditHandleRef.current.close();
+                if (modalDeleteHandleRef.current) modalDeleteHandleRef.current.close();
             }
         }),
         [contentRef],
@@ -906,6 +906,7 @@ const EventCalendar = (props: EventCalendarProps) => {
 
                 {/*<!-- DELETE -->*/}
                 <ModalDialog
+                    ref={modalDeleteHandleRef}
                     show={showDelete}
                     maskOpacity={modalMaskOpacity}
                     triggerClassName=""
@@ -934,6 +935,7 @@ const EventCalendar = (props: EventCalendarProps) => {
 
                 {/*<!-- EDIT -->*/}
                 <ModalDialog
+                    ref={modalEditHandleRef}
                     show={showEdit}
                     maskOpacity={modalMaskOpacity}
                     heading={modalHeading}