From 45398c839f2cdee1b386e23779bc6913edf02c5f Mon Sep 17 00:00:00 2001
From: Carson <cpsievert1@gmail.com>
Date: Fri, 13 May 2022 16:35:34 -0500
Subject: [PATCH] Remove the setTimeout() + bindAll() hack

---
 ipyshiny/static/output.js |  2 +-
 js/src/output.ts          | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ipyshiny/static/output.js b/ipyshiny/static/output.js
index a49de46..103beb0 100644
--- a/ipyshiny/static/output.js
+++ b/ipyshiny/static/output.js
@@ -36,7 +36,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
   \***********************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @jupyter-widgets/html-manager */ \"@jupyter-widgets/html-manager\");\n/* harmony import */ var _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _comm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./comm */ \"./src/comm.ts\");\n/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ \"./src/utils.ts\");\n\n\n\n/******************************************************************************\n * Define a custom HTMLManager for use with Shiny\n ******************************************************************************/\nclass OutputManager extends _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__.HTMLManager {\n    // In a soon-to-be-released version of @jupyter-widgets/html-manager,\n    // display_view()'s first \"dummy\" argument will be removed... this shim simply\n    // makes it so that our manager can work with either version\n    // https://github.com/jupyter-widgets/ipywidgets/commit/159bbe4#diff-45c126b24c3c43d2cee5313364805c025e911c4721d45ff8a68356a215bfb6c8R42-R43\n    async display_view(view, options) {\n        const n_args = super.display_view.length;\n        if (n_args === 3) {\n            return super.display_view({}, view, options);\n        }\n        else {\n            // @ts-ignore\n            return super.display_view(view, options);\n        }\n    }\n}\n// shiny includes require.js and also sets `define.amd=false` to prevent <script>s\n// with UMD loaders from triggering anonymous define() errors. For many widgets, this\n// isn't an issue since they mostly define() without first checking for define.amd,\n// but at least pydeck (at the moment) does check for define.amd and does the wrong\n// thing if it's set to false.\nconst shinyRequireLoader = async function (moduleName, moduleVersion) {\n    const oldAmd = window.define.amd;\n    window.define.amd = { jQuery: true }; // i.e. restore the value that require.js sets\n    try {\n        await (0,_jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__.requireLoader)(moduleName, moduleVersion);\n    }\n    finally {\n        window.define.amd = oldAmd;\n    }\n};\nconst manager = new OutputManager({ loader: shinyRequireLoader });\n/******************************************************************************\n* Define the Shiny binding\n******************************************************************************/\n// Ideally we'd extend Shiny's HTMLOutputBinding, but the implementation isn't exported\nclass IPyWidgetOutput extends Shiny.OutputBinding {\n    find(scope) {\n        return $(scope).find(\".shiny-ipywidget-output\");\n    }\n    onValueError(el, err) {\n        Shiny.unbindAll(el);\n        this.renderError(el, err);\n    }\n    renderValue(el, data) {\n        // Allow for a None/null value to hide the widget (css inspired by htmlwidgets)\n        if (!data) {\n            el.style.visibility = \"hidden\";\n            return;\n        }\n        else {\n            el.style.visibility = \"inherit\";\n        }\n        const model = manager.get_model(data.model_id);\n        if (!model) {\n            throw new Error(`No model found for id ${data.model_id}`);\n        }\n        model.then((m) => {\n            const view = manager.create_view(m, {});\n            view.then(v => {\n                manager.display_view(v, { el: el }).then(() => {\n                    // TODO: This is not an ideal way to handle the case where another render\n                    // is requested before the last one is finished displaying the view, but\n                    // it's probably the least unobtrusive way to handle this for now\n                    while (el.childNodes.length > 1) {\n                        el.removeChild(el.childNodes[0]);\n                    }\n                });\n            });\n        });\n    }\n}\nShiny.outputBindings.register(new IPyWidgetOutput(), \"shiny.IPyWidgetOutput\");\n// By the time this code executes (i.e., by the time the `callback` in\n// `require([\"@jupyter-widgets/html-manager\"], callback)` executes, it seems to be too\n// late to register the output binding in a way that it'll \"just work\" for dynamic UI.\n// Moreover, when this code executes, dynamic UI when yet be loaded, so schedule\n// a bind to happen on the next tick.\n// TODO: this is a hack. Could we do something better?\nsetTimeout(() => { Shiny.bindAll(document.body); }, 0);\n/******************************************************************************\n* Handle messages from the server-side Widget\n******************************************************************************/\n// Initialize the comm and model when a new widget is created\n// This is basically our version of https://github.com/jupyterlab/jupyterlab/blob/d33de15/packages/services/src/kernel/default.ts#L1144-L1176\nShiny.addCustomMessageHandler(\"ipyshiny_comm_open\", (msg_txt) => {\n    setBaseURL();\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    Shiny.renderDependencies(msg.content.html_deps);\n    const comm = new _comm__WEBPACK_IMPORTED_MODULE_1__.ShinyComm(msg.content.comm_id);\n    manager.handle_comm_open(comm, msg);\n});\n// Handle any mutation of the model (e.g., add a marker to a map, without a full redraw)\n// Basically out version of https://github.com/jupyterlab/jupyterlab/blob/d33de15/packages/services/src/kernel/default.ts#L1200-L1215\nShiny.addCustomMessageHandler(\"ipyshiny_comm_msg\", (msg_txt) => {\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    manager.get_model(msg.content.comm_id).then(m => {\n        // @ts-ignore for some reason IClassicComm doesn't have this method, but we do\n        m.comm.handle_msg(msg);\n    });\n});\n// TODO: test that this actually works\nShiny.addCustomMessageHandler(\"ipyshiny_comm_close\", (msg_txt) => {\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    manager.get_model(msg.content.comm_id).then(m => {\n        // @ts-ignore for some reason IClassicComm doesn't have this method, but we do\n        m.comm.handle_close(msg);\n    });\n});\n// Our version of https://github.com/jupyter-widgets/widget-cookiecutter/blob/9694718/%7B%7Bcookiecutter.github_project_name%7D%7D/js/lib/extension.js#L8\nfunction setBaseURL(x = '') {\n    const base_url = document.querySelector('body').getAttribute('data-base-url');\n    if (!base_url) {\n        document.querySelector('body').setAttribute('data-base-url', x);\n    }\n}\n\n\n//# sourceURL=webpack://@jupyter-widgets/prism-embed-manager/./src/output.ts?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @jupyter-widgets/html-manager */ \"@jupyter-widgets/html-manager\");\n/* harmony import */ var _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _comm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./comm */ \"./src/comm.ts\");\n/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ \"./src/utils.ts\");\n\n\n\n/******************************************************************************\n * Define a custom HTMLManager for use with Shiny\n ******************************************************************************/\nclass OutputManager extends _jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__.HTMLManager {\n    // In a soon-to-be-released version of @jupyter-widgets/html-manager,\n    // display_view()'s first \"dummy\" argument will be removed... this shim simply\n    // makes it so that our manager can work with either version\n    // https://github.com/jupyter-widgets/ipywidgets/commit/159bbe4#diff-45c126b24c3c43d2cee5313364805c025e911c4721d45ff8a68356a215bfb6c8R42-R43\n    async display_view(view, options) {\n        const n_args = super.display_view.length;\n        if (n_args === 3) {\n            return super.display_view({}, view, options);\n        }\n        else {\n            // @ts-ignore\n            return super.display_view(view, options);\n        }\n    }\n}\n// shiny includes require.js and also sets `define.amd=false` to prevent <script>s\n// with UMD loaders from triggering anonymous define() errors. For many widgets, this\n// isn't an issue since they mostly define() without first checking for define.amd,\n// but at least pydeck (at the moment) does check for define.amd and does the wrong\n// thing if it's set to false.\nconst shinyRequireLoader = async function (moduleName, moduleVersion) {\n    const oldAmd = window.define.amd;\n    window.define.amd = { jQuery: true }; // i.e. restore the value that require.js sets\n    try {\n        await (0,_jupyter_widgets_html_manager__WEBPACK_IMPORTED_MODULE_0__.requireLoader)(moduleName, moduleVersion);\n    }\n    finally {\n        window.define.amd = oldAmd;\n    }\n};\nconst manager = new OutputManager({ loader: shinyRequireLoader });\n/******************************************************************************\n* Define the Shiny binding\n******************************************************************************/\n// Ideally we'd extend Shiny's HTMLOutputBinding, but the implementation isn't exported\nclass IPyWidgetOutput extends Shiny.OutputBinding {\n    find(scope) {\n        return $(scope).find(\".shiny-ipywidget-output\");\n    }\n    onValueError(el, err) {\n        Shiny.unbindAll(el);\n        this.renderError(el, err);\n    }\n    renderValue(el, data) {\n        // Allow for a None/null value to hide the widget (css inspired by htmlwidgets)\n        if (!data) {\n            el.style.visibility = \"hidden\";\n            return;\n        }\n        else {\n            el.style.visibility = \"inherit\";\n        }\n        const model = manager.get_model(data.model_id);\n        if (!model) {\n            throw new Error(`No model found for id ${data.model_id}`);\n        }\n        model.then((m) => {\n            const view = manager.create_view(m, {});\n            view.then(v => {\n                manager.display_view(v, { el: el }).then(() => {\n                    // TODO: This is not an ideal way to handle the case where another render\n                    // is requested before the last one is finished displaying the view, but\n                    // it's probably the least unobtrusive way to handle this for now\n                    while (el.childNodes.length > 1) {\n                        el.removeChild(el.childNodes[0]);\n                    }\n                });\n            });\n        });\n    }\n}\nShiny.outputBindings.register(new IPyWidgetOutput(), \"shiny.IPyWidgetOutput\");\n/******************************************************************************\n* Handle messages from the server-side Widget\n******************************************************************************/\n// Initialize the comm and model when a new widget is created\n// This is basically our version of https://github.com/jupyterlab/jupyterlab/blob/d33de15/packages/services/src/kernel/default.ts#L1144-L1176\nShiny.addCustomMessageHandler(\"ipyshiny_comm_open\", (msg_txt) => {\n    setBaseURL();\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    Shiny.renderDependencies(msg.content.html_deps);\n    const comm = new _comm__WEBPACK_IMPORTED_MODULE_1__.ShinyComm(msg.content.comm_id);\n    manager.handle_comm_open(comm, msg);\n});\n// Handle any mutation of the model (e.g., add a marker to a map, without a full redraw)\n// Basically out version of https://github.com/jupyterlab/jupyterlab/blob/d33de15/packages/services/src/kernel/default.ts#L1200-L1215\nShiny.addCustomMessageHandler(\"ipyshiny_comm_msg\", (msg_txt) => {\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    manager.get_model(msg.content.comm_id).then(m => {\n        // @ts-ignore for some reason IClassicComm doesn't have this method, but we do\n        m.comm.handle_msg(msg);\n    });\n});\n// TODO: test that this actually works\nShiny.addCustomMessageHandler(\"ipyshiny_comm_close\", (msg_txt) => {\n    const msg = (0,_utils__WEBPACK_IMPORTED_MODULE_2__.jsonParse)(msg_txt);\n    manager.get_model(msg.content.comm_id).then(m => {\n        // @ts-ignore for some reason IClassicComm doesn't have this method, but we do\n        m.comm.handle_close(msg);\n    });\n});\n// Our version of https://github.com/jupyter-widgets/widget-cookiecutter/blob/9694718/%7B%7Bcookiecutter.github_project_name%7D%7D/js/lib/extension.js#L8\nfunction setBaseURL(x = '') {\n    const base_url = document.querySelector('body').getAttribute('data-base-url');\n    if (!base_url) {\n        document.querySelector('body').setAttribute('data-base-url', x);\n    }\n}\n\n\n//# sourceURL=webpack://@jupyter-widgets/prism-embed-manager/./src/output.ts?");
 
 /***/ }),
 
diff --git a/js/src/output.ts b/js/src/output.ts
index 06c118f..6afcc3a 100644
--- a/js/src/output.ts
+++ b/js/src/output.ts
@@ -81,21 +81,12 @@ class IPyWidgetOutput extends Shiny.OutputBinding {
           }
         })
       });
-    });
+    }); 
   }
 }
 
 Shiny.outputBindings.register(new IPyWidgetOutput(), "shiny.IPyWidgetOutput");
 
-// By the time this code executes (i.e., by the time the `callback` in
-// `require(["@jupyter-widgets/html-manager"], callback)` executes, it seems to be too
-// late to register the output binding in a way that it'll "just work" for dynamic UI.
-// Moreover, when this code executes, dynamic UI when yet be loaded, so schedule
-// a bind to happen on the next tick.
-// TODO: this is a hack. Could we do something better?
-setTimeout(() => { Shiny.bindAll(document.body); }, 0);
-
-
 /******************************************************************************
 * Handle messages from the server-side Widget
 ******************************************************************************/