@devvit/ui-renderer 0.10.11-next-2023-12-13-72cf71865.0 → 0.10.11-next-2023-12-13-9458b6d1f.0

package/client/formbuilder/devvit-form-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devvit-form-dialog.d.ts","sourceRoot":"","sources":["../../../library/src/client/formbuilder/devvit-form-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAIvD,OAAO,kEAAkE,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AAEtF,OAAO,EAAE,cAAc,EAAwB,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAoB,MAAM,gDAAgD,CAAC;AAGjG,OAAO,EAAE,IAAI,EAA4C,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAKzF,OAAO,kDAAkD,CAAC;AAC1D,OAAO,gDAAgD,CAAC;AAIxD,MAAM,WAAW,qBAAsB,SAAQ,cAAc,CAAC,0BAA0B,CAAC;IACvF,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,OAAO,CAAC;KAChB,CAAC;CACH;AAED,qBACa,gBAAiB,SAAQ,UAAU;;IAE9C,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAGvB,OAAO,CAAC,EAAE,eAAe,CAAC;IAG1B,KAAK,CAAC,EAAE,aAAa,CAAC;IAKtB,WAAoB,MAAM,8BAEzB;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;IAsFpD,MAAM;CAgDhB"}
+{"version":3,"file":"devvit-form-dialog.d.ts","sourceRoot":"","sources":["../../../library/src/client/formbuilder/devvit-form-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAIvD,OAAO,kEAAkE,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AAEtF,OAAO,EAAE,cAAc,EAAwB,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAoB,MAAM,gDAAgD,CAAC;AAGjG,OAAO,EAAE,IAAI,EAA4C,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAKzF,OAAO,kDAAkD,CAAC;AAC1D,OAAO,gDAAgD,CAAC;AAIxD,MAAM,WAAW,qBAAsB,SAAQ,cAAc,CAAC,0BAA0B,CAAC;IACvF,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,OAAO,CAAC;KAChB,CAAC;CACH;AAED,qBACa,gBAAiB,SAAQ,UAAU;;IAE9C,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAGvB,OAAO,CAAC,EAAE,eAAe,CAAC;IAG1B,KAAK,CAAC,EAAE,aAAa,CAAC;IAKtB,WAAoB,MAAM,8BAEzB;IAED,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;IA+FpD,MAAM;CAmDhB"}

package/client/formbuilder/devvit-form-dialog.js

@@ -18,7 +18,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _DevvitFormDialog_onEvent, _DevvitFormDialog_idMap, _DevvitFormDialog_makeIdMap, _DevvitFormDialog_collectValues, _DevvitFormDialog_submitClicked, _DevvitFormDialog_cancelClicked, _DevvitFormDialog_closeDialog, _DevvitFormDialog_dispatchFormStatusToHost, _DevvitFormDialog_renderTitle, _DevvitFormDialog_renderDescription, _DevvitFormDialog_renderButtons;
+var _DevvitFormDialog_onEvent, _DevvitFormDialog_idMap, _DevvitFormDialog_makeIdMap, _DevvitFormDialog_collectValues, _DevvitFormDialog_submitClicked, _DevvitFormDialog_cancelClicked, _DevvitFormDialog_onDialogClosed, _DevvitFormDialog_dispatchFormStatusToHost, _DevvitFormDialog_fixFocustrap, _DevvitFormDialog_renderTitle, _DevvitFormDialog_renderDescription, _DevvitFormDialog_renderButtons;
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
@@ -91,13 +91,13 @@ let DevvitFormDialog = class DevvitFormDialog extends LitElement {
                     results: __classPrivateFieldGet(this, _DevvitFormDialog_collectValues, "f").call(this),
                 },
             }));
-            __classPrivateFieldGet(this, _DevvitFormDialog_closeDialog, "f").call(this);
+            this.$dialog?.close();
         });
         _DevvitFormDialog_cancelClicked.set(this, () => {
-            __classPrivateFieldGet(this, _DevvitFormDialog_closeDialog, "f").call(this);
-        });
-        _DevvitFormDialog_closeDialog.set(this, () => {
             this.$dialog?.close();
+        });
+        // don't call directly, should be used as event listener to dialog closed
+        _DevvitFormDialog_onDialogClosed.set(this, () => {
             this.form = undefined;
             __classPrivateFieldSet(this, _DevvitFormDialog_idMap, {}, "f");
             __classPrivateFieldGet(this, _DevvitFormDialog_dispatchFormStatusToHost, "f").call(this, { open: false });
@@ -105,26 +105,34 @@ let DevvitFormDialog = class DevvitFormDialog extends LitElement {
         _DevvitFormDialog_dispatchFormStatusToHost.set(this, ({ open }) => {
             this.dispatchEvent(customEvent('devvit-form-dialog-event', { open }));
         });
+        _DevvitFormDialog_fixFocustrap.set(this, (event) => {
+            // faceplate-dialog has a known issue with focus management.
+            // Inputs are not registered as "focusable" so click on input label is handled by focus trap incorrectly
+            // faceplate-ui team knows about it, but the solution is not yet ready
+            // this is a band-aid that prevents focus trap from knowing that we did the click
+            // and blocks incorrect behaviour from happening
+            event.stopPropagation();
+        });
         _DevvitFormDialog_renderTitle.set(this, () => html `<span class="text-32 py-sm">${this.form?.title}</span>`);
         _DevvitFormDialog_renderDescription.set(this, () => html `<span class="pb-md">${this.form?.shortDescription}</span>`);
         _DevvitFormDialog_renderButtons.set(this, () => html `
     <div class="flex justify-end space-x-xs">
       ${button({
-            appearance: 'primary',
+            appearance: 'secondary',
             size: ButtonSize.Medium,
-            children: this.form?.acceptLabel ?? msg('OK', { desc: 'Submit input for the custom action' }),
+            children: this.form?.cancelLabel ??
+                msg('Cancel', { desc: 'Cancel custom action and dismiss dialog' }),
             attributes: {
-                type: 'submit',
-                onclick: __classPrivateFieldGet(this, _DevvitFormDialog_submitClicked, "f"),
+                onclick: __classPrivateFieldGet(this, _DevvitFormDialog_cancelClicked, "f"),
             },
         })}
       ${button({
-            appearance: 'secondary',
+            appearance: 'primary',
             size: ButtonSize.Medium,
-            children: this.form?.cancelLabel ??
-                msg('Cancel', { desc: 'Cancel custom action and dismiss dialog' }),
+            children: this.form?.acceptLabel ?? msg('OK', { desc: 'Submit input for the custom action' }),
             attributes: {
-                onclick: __classPrivateFieldGet(this, _DevvitFormDialog_cancelClicked, "f"),
+                type: 'submit',
+                onclick: __classPrivateFieldGet(this, _DevvitFormDialog_submitClicked, "f"),
             },
         })}
     </div>
@@ -144,8 +152,11 @@ let DevvitFormDialog = class DevvitFormDialog extends LitElement {
     }
     render() {
         return html `
-      <faceplate-dialog class="z-dialog w-[32rem] overflow-auto">
-        <div class="flex flex-col gap-y-sm">
+      <faceplate-dialog
+        class="z-dialog w-[32rem] overflow-auto"
+        @faceplate-close="${__classPrivateFieldGet(this, _DevvitFormDialog_onDialogClosed, "f")}"
+      >
+        <div class="flex flex-col gap-y-sm" @focusin="${__classPrivateFieldGet(this, _DevvitFormDialog_fixFocustrap, "f")}">
           ${when(this.form?.title, __classPrivateFieldGet(this, _DevvitFormDialog_renderTitle, "f"))}
           ${when(this.form?.shortDescription, __classPrivateFieldGet(this, _DevvitFormDialog_renderDescription, "f"))}
           <faceplate-form
@@ -167,8 +178,9 @@ _DevvitFormDialog_makeIdMap = new WeakMap();
 _DevvitFormDialog_collectValues = new WeakMap();
 _DevvitFormDialog_submitClicked = new WeakMap();
 _DevvitFormDialog_cancelClicked = new WeakMap();
-_DevvitFormDialog_closeDialog = new WeakMap();
+_DevvitFormDialog_onDialogClosed = new WeakMap();
 _DevvitFormDialog_dispatchFormStatusToHost = new WeakMap();
+_DevvitFormDialog_fixFocustrap = new WeakMap();
 _DevvitFormDialog_renderTitle = new WeakMap();
 _DevvitFormDialog_renderDescription = new WeakMap();
 _DevvitFormDialog_renderButtons = new WeakMap();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/ui-renderer",
-  "version": "0.10.11-next-2023-12-13-72cf71865.0",
+  "version": "0.10.11-next-2023-12-13-9458b6d1f.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -54,10 +54,10 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.10.11-next-2023-12-13-72cf71865.0",
-    "@devvit/runtime-lite": "0.10.11-next-2023-12-13-72cf71865.0",
-    "@devvit/runtimes": "0.10.11-next-2023-12-13-72cf71865.0",
-    "@devvit/shared-types": "0.10.11-next-2023-12-13-72cf71865.0",
+    "@devvit/protos": "0.10.11-next-2023-12-13-9458b6d1f.0",
+    "@devvit/runtime-lite": "0.10.11-next-2023-12-13-9458b6d1f.0",
+    "@devvit/runtimes": "0.10.11-next-2023-12-13-9458b6d1f.0",
+    "@devvit/shared-types": "0.10.11-next-2023-12-13-9458b6d1f.0",
     "@lottiefiles/lottie-player": "1.7.1",
     "p-queue": "7.3.4",
     "rxjs": "7.5.7"
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@devvit/eslint-config": "0.10.10",
     "@devvit/repo-tools": "0.10.10",
-    "@devvit/tsconfig": "0.10.11-next-2023-12-13-72cf71865.0",
+    "@devvit/tsconfig": "0.10.11-next-2023-12-13-9458b6d1f.0",
     "@lit-labs/ssr": "^2.2.3",
     "@lit/localize": "0.11.4",
     "@open-wc/testing-helpers": "2.3.0",
@@ -116,5 +116,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "492c6acbbe0befcae171c0a3f1b8234f8c7ee2a6"
+  "gitHead": "9d4ed089a50057bededbf64ad8abd2972fd4643d"
 }