Fix primefaces#2893: Update imperativeHandle as it blocks access to ref

melloware · Jul 7, 2022 · 02221bf · 02221bf
1 parent 23ad0fa
commit 02221bf
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 35 deletions.
diff --git a/components/lib/autocomplete/AutoComplete.js b/components/lib/autocomplete/AutoComplete.js
@@ -454,7 +454,8 @@ export const AutoComplete = React.memo(React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        search
+        search,
+        ...ref
     }));
 
     const createSimpleAutoComplete = () => {

diff --git a/components/lib/blockui/BlockUI.js b/components/lib/blockui/BlockUI.js
@@ -64,7 +64,8 @@ export const BlockUI = React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         block,
-        unblock
+        unblock,
+        ...ref
     }));
 
     const createMask = () => {

diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
@@ -2484,7 +2484,8 @@ export const Calendar = React.memo(React.forwardRef((props, ref) => {
         hide,
         getCurrentDateTime,
         getViewDate,
-        updateViewDate
+        updateViewDate,
+        ...ref
     }));
 
     const createBackwardNavigator = (isVisible) => {

diff --git a/components/lib/captcha/Captcha.js b/components/lib/captcha/Captcha.js
@@ -82,7 +82,8 @@ export const Captcha = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         reset,
-        getResponse
+        getResponse,
+        ...ref
     }));
 
     const otherProps = ObjectUtils.findDiffKeys(props, Captcha.defaultProps);

diff --git a/components/lib/chart/Chart.js b/components/lib/chart/Chart.js
@@ -35,7 +35,8 @@ export const Chart = React.memo(React.forwardRef((props, ref) => {
         getChart: () => chartRef.current,
         getBase64Image: () => chartRef.current.toBase64Image(),
         generateLegend: () => chartRef.current && chartRef.current.generateLegend(),
-        refresh: () => chartRef.current && chartRef.current.update()
+        refresh: () => chartRef.current && chartRef.current.update(),
+        ...ref
     }));
 
     React.useEffect(() => {

diff --git a/components/lib/confirmdialog/ConfirmDialog.js b/components/lib/confirmdialog/ConfirmDialog.js
@@ -94,7 +94,8 @@ export const ConfirmDialog = React.memo(React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        confirm
+        confirm,
+        ...ref
     }));
 
     const createFooter = () => {

diff --git a/components/lib/confirmpopup/ConfirmPopup.js b/components/lib/confirmpopup/ConfirmPopup.js
@@ -179,7 +179,8 @@ export const ConfirmPopup = React.memo(React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        confirm
+        confirm,
+        ...ref
     }));
 
     const createContent = () => {

diff --git a/components/lib/contextmenu/ContextMenu.js b/components/lib/contextmenu/ContextMenu.js
@@ -165,7 +165,8 @@ export const ContextMenu = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createContextMenu = () => {

diff --git a/components/lib/datascroller/DataScroller.js b/components/lib/datascroller/DataScroller.js
@@ -142,7 +142,8 @@ export const DataScroller = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         load,
-        reset
+        reset,
+        ...ref
     }));
 
     const createHeader = () => {

diff --git a/components/lib/datatable/DataTable.js b/components/lib/datatable/DataTable.js
@@ -1324,7 +1324,8 @@ export const DataTable = React.forwardRef((props, ref) => {
         resetColumnOrder,
         closeEditingCell,
         restoreTableState,
-        clearState
+        clearState,
+        ...ref
     }));
 
     const createLoader = () => {

diff --git a/components/lib/dialog/Dialog.js b/components/lib/dialog/Dialog.js
@@ -399,7 +399,8 @@ export const Dialog = React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        resetPosition
+        resetPosition,
+        ...ref
     }));
 
     const createCloseIcon = () => {

diff --git a/components/lib/editor/Editor.js b/components/lib/editor/Editor.js
@@ -86,7 +86,8 @@ export const Editor = React.memo(React.forwardRef((props, ref) => {
     }, [props.value]);
 
     React.useImperativeHandle(ref, () => ({
-        getQuill
+        getQuill,
+        ...ref
     }));
 
     const createToolbarHeader = () => {

diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js
@@ -315,7 +315,8 @@ export const FileUpload = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         upload,
         clear,
-        formatSize
+        formatSize,
+        ...ref
     }));
 
     const createChooseButton = () => {

diff --git a/components/lib/galleria/Galleria.js b/components/lib/galleria/Galleria.js
@@ -106,7 +106,8 @@ export const Galleria = React.memo(React.forwardRef((props, ref) => {
         hide,
         isAutoPlayActive,
         startSlideShow,
-        stopSlideShow
+        stopSlideShow,
+        ...ref
     }));
 
     const createHeader = () => {

diff --git a/components/lib/gmap/GMap.js b/components/lib/gmap/GMap.js
@@ -111,7 +111,8 @@ export const GMap = React.memo(React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        getMap
+        getMap,
+        ...ref
     }));
 
     const otherProps = ObjectUtils.findDiffKeys(props, GMap.defaultProps);

diff --git a/components/lib/inputnumber/InputNumber.js b/components/lib/inputnumber/InputNumber.js
@@ -934,7 +934,8 @@ export const InputNumber = React.memo(React.forwardRef((props, ref) => {
     }
 
     React.useImperativeHandle(ref, () => ({
-        getFormatter
+        getFormatter,
+        ...ref
     }));
 
     React.useEffect(() => {

diff --git a/components/lib/menu/Menu.js b/components/lib/menu/Menu.js
@@ -124,7 +124,8 @@ export const Menu = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         toggle,
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createSubmenu = (submenu, index) => {

diff --git a/components/lib/menubar/Menubar.js b/components/lib/menubar/Menubar.js
@@ -49,7 +49,8 @@ export const Menubar = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         toggle,
-        useCustomContent
+        useCustomContent,
+        ...ref
     }));
 
     const createStartContent = () => {

diff --git a/components/lib/messages/Messages.js b/components/lib/messages/Messages.js
@@ -45,7 +45,8 @@ export const Messages = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         show,
         replace,
-        clear
+        clear,
+        ...ref
     }));
 
     const otherProps = ObjectUtils.findDiffKeys(props, Messages.defaultProps);

diff --git a/components/lib/overlaypanel/OverlayPanel.js b/components/lib/overlaypanel/OverlayPanel.js
@@ -176,7 +176,8 @@ export const OverlayPanel = React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         toggle,
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createCloseIcon = () => {

diff --git a/components/lib/radiobutton/RadioButton.js b/components/lib/radiobutton/RadioButton.js
@@ -52,7 +52,8 @@ export const RadioButton = React.memo(React.forwardRef((props, ref) => {
     }, [inputRef, props.inputRef]);
 
     React.useImperativeHandle(ref, () => ({
-        select
+        select,
+        ...ref
     }));
 
     const hasTooltip = ObjectUtils.isNotEmpty(props.tooltip);

diff --git a/components/lib/scrollpanel/ScrollPanel.js b/components/lib/scrollpanel/ScrollPanel.js
@@ -149,7 +149,8 @@ export const ScrollPanel = React.forwardRef((props, ref) => {
     });
 
     React.useImperativeHandle(ref, () => ({
-        refresh
+        refresh,
+        ...ref
     }));
 
     const otherProps = ObjectUtils.findDiffKeys(props, ScrollPanel.defaultProps);

diff --git a/components/lib/slidemenu/SlideMenu.js b/components/lib/slidemenu/SlideMenu.js
@@ -88,7 +88,8 @@ export const SlideMenu = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         toggle,
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createBackward = () => {

diff --git a/components/lib/speeddial/SpeedDial.js b/components/lib/speeddial/SpeedDial.js
@@ -147,7 +147,8 @@ export const SpeedDial = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createItem = (item, index) => {

diff --git a/components/lib/splitbutton/SplitButton.js b/components/lib/splitbutton/SplitButton.js
@@ -81,7 +81,8 @@ export const SplitButton = React.memo(React.forwardRef((props, ref) => {
 
     React.useImperativeHandle(ref, () => ({
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createItems = () => {

diff --git a/components/lib/tabview/TabView.js b/components/lib/tabview/TabView.js
@@ -146,7 +146,8 @@ export const TabView = React.forwardRef((props, ref) => {
     }, [props.activeIndex]);
 
     React.useImperativeHandle(ref, () => ({
-        reset
+        reset,
+        ...ref
     }));
 
     const createTabHeader = (tab, index) => {

diff --git a/components/lib/tieredmenu/TieredMenu.js b/components/lib/tieredmenu/TieredMenu.js
@@ -73,7 +73,8 @@ export const TieredMenu = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         toggle,
         show,
-        hide
+        hide,
+        ...ref
     }));
 
     const createElement = () => {

diff --git a/components/lib/toast/Toast.js b/components/lib/toast/Toast.js
@@ -68,7 +68,8 @@ export const Toast = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         show,
         replace,
-        clear
+        clear,
+        ...ref
     }));
 
     const createElement = () => {

diff --git a/components/lib/tooltip/Tooltip.js b/components/lib/tooltip/Tooltip.js
@@ -432,7 +432,8 @@ export const Tooltip = React.memo(React.forwardRef((props, ref) => {
     React.useImperativeHandle(ref, () => ({
         updateTargetEvents,
         loadTargetEvents,
-        unloadTargetEvents
+        unloadTargetEvents,
+        ...ref
     }));
 
     const createElement = () => {

diff --git a/components/lib/tree/Tree.js b/components/lib/tree/Tree.js
@@ -286,7 +286,8 @@ export const Tree = React.memo(React.forwardRef((props, ref) => {
     }
 
     React.useImperativeHandle(ref, () => ({
-        filter
+        filter,
+        ...ref
     }));
 
     const createRootChild = (node, index, last) => {

diff --git a/components/lib/treetable/TreeTable.js b/components/lib/treetable/TreeTable.js
@@ -791,7 +791,8 @@ export const TreeTable = React.forwardRef((props, ref) => {
     }
 
     React.useImperativeHandle(ref, () => ({
-        filter
+        filter,
+        ...ref
     }));
 
     const createTableHeader = (columns, columnGroup) => {

diff --git a/components/lib/virtualscroller/VirtualScroller.js b/components/lib/virtualscroller/VirtualScroller.js
@@ -517,7 +517,8 @@ export const VirtualScroller = React.memo(React.forwardRef((props, ref) => {
         scrollTo,
         scrollToIndex,
         scrollInView,
-        getRenderedRange
+        getRenderedRange,
+        ...ref
     }));
 
     const createLoaderItem = (index, extOptions = {}) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/datatable/export.js b/pages/datatable/export.js
@@ -102,7 +102,7 @@ const DataTableExportDemo = () => {
         import('jspdf').then((jsPDF) => {
             import('jspdf-autotable').then(() => {
                 const doc = new jsPDF.default(0, 0);
-                doc.autoTable(exportColumns, products);
+                doc.autoTable(exportColumns, dt.current.value);
                 doc.save('products.pdf');
             });
         });
-Original file line number
+Diff line change
@@ Expand Up @@
         });
         React.useImperativeHandle(ref, () => ({
-            search
+            search,
+            ...ref
         }));
         const createSimpleAutoComplete = () => {
@@ Expand Down @@