@vaadin/crud 24.2.0-dev.f254716fe → 24.2.0-rc1

package/LICENSE

@@ -14,7 +14,7 @@ AND DESTROY OR RETURN ALL COPIES OF THE PRODUCT.
 IF YOU ARE AGREEING TO THESE TERMS ON BEHALF OF YOURSELF IN YOUR INDIVIDUAL 
 CAPACITY, THEN YOU ARE THE CUSTOMER. IF YOU ARE AGREEING TO THESE TERMS ON 
 BEHALF OF YOUR COMPANY, THEN YOUR COMPANY IS THE CUSTOMER.
- 
+
 1. Definitions
 1.1. In these Commercial Terms, unless the context requires otherwise, the 
 following words and phrases shall have the following meanings:
@@ -219,11 +219,12 @@ License as set forth herein and in the applicable Order.
 
 4.3. Developer License
 4.3.1 General Provisions
-4.3.1.2 This Section 4.3 contains the terms and conditions of Vaadin’s 
+4.3.1.1 This Section 4.3 contains the terms and conditions of Vaadin’s 
 developer License (“Developer License”), under which Vaadin licenses 
 development components for use by a Developer.
-Vaadin grants to Customer, based on full payment of the Subscription fee, a 
-worldwide, royalty-free, non-exclusive, limited License to Use Licensed 
+
+4.3.1.2 Vaadin grants to Customer, based on full payment of the Subscription 
+fee, a worldwide, royalty-free, non-exclusive, limited License to Use Licensed 
 Software in Project(s). 
 
 4.3.1.3 Customer must procure the right to Use Licensed Software for each 
@@ -309,7 +310,7 @@ in the applicable Order.
 4.4.3. Customer may grant licenses, for free or based on a payment, to the 
 Authorized Application(s) including Licensed Software, whether regarded as 
 derivative works or not, as long as Customer has obtained from Vaadin a valid 
-Runtime License for and on behalf of Customer’s own Customers (that Use 
+Runtime License for and on behalf of Customer’s own customers (that Use 
 Licensed Software), or Customer clearly communicates that anyone Using Licensed 
 Software needs to obtain a valid Runtime License from Vaadin prior to 
 installation and use of the Authorized Application(s) including Licensed 
@@ -402,7 +403,7 @@ and components for the duration of the Subscription in accordance with the
 applicable license terms set for each tool and component. Unless otherwise set 
 out in the applicable license terms set for each tool or component, Customer’s 
 right of use shall expire without a separate notice when the Subscription is 
-terminated or expires. 
+terminated or expires.
 
 6.4. Expert Chat
 6.4.1. Customer is offered access to a chat service, where Vaadin’s expert team 
@@ -446,10 +447,6 @@ does not authorize the continuation of the service request at their expense.
 Software to be fixed. There can be only one open warranty request at a time per 
 Subscription. Vaadin reserves the right to choose, at its sole discretion, 
 which warranty requests will be fixed.
-During the Support Hours, the resolution of a support request will be started 
-within two (2) business days. If Vaadin fails to start the resolution as 
-agreed, Customer will be compensated with one (1) free Expert on Demand hour 
-that is added to the time balance.
 
 6.6.2. During the Support Hours, the resolution of a support request will be 
 started within two (2) business days. If Vaadin fails to start the resolution 
@@ -491,7 +488,8 @@ and corresponds with the deliverables and which product or service is offered
 for use to Customer by Vaadin without separate charge. The aforesaid indemnity 
 obligation of Vaadin shall, however, always be limited to an amount equal to 
 three times the yearly Subscription fee, and Vaadin’s liability for indemnified 
-claims shall be limited to this Section 6.9.
+claims shall be limited to this Section 6.8.
+
 
 6.9. Extended Maintenance for Vaadin
 6.9.1. The extended maintenance for Vaadin Service extends the coverage of the 
@@ -506,7 +504,7 @@ that the latest minor versions of Vaadin platform versions 10, 14, and 23+ are
 covered for the duration of the Subscription term.
 
 6.9.3. Any and all changes to the software covered by Extended Maintenance may 
-be published under commercial or non-commercial License and will be made 
+be published under a commercial or non-commercial License and will be made 
 available exclusively to Customers that have subscribed to the extended 
 maintenance for Vaadin Service.
 
@@ -531,6 +529,23 @@ that is added to the time balance.
 6.10.3. Vaadin will build a new version of the Custom Build on demand basis, 
 however, at most once a month.
 
+6.11. Technical Success Manager
+6.11.1 Technical Success Manager (“TSM”) is a technical expert allocated to 
+help Customer to use Vaadin’s products and services in a productive manner. 
+TSM's areas of expertise include, but are not limited to, answering technical 
+questions, disseminating best practices, and coordinating work between Customer 
+and Vaadin.
+
+6.11.2. Customer may request regular meetings with the TSM with a maximum 
+monthly total of four (4) hours of active meeting time. Preparation and 
+coordination time related to the meetings is not included in the above 
+mentioned monthly total.
+
+6.11.3. Software programming and project management are not included in the 
+scope of this TSM service referred to in this Section 6.11. Programming and 
+project management services are provided under Expert on Demand and Consulting 
+services.
+
 7. Consulting
 7.1. Delivery of Consulting
 7.1.1 The Parties may agree upon the delivery of Consulting in an Order, SOW, 
@@ -584,7 +599,7 @@ of this Section and is not to be interpreted as a penalty or punishment
 therefor.
 
 7.4. Sponsored Development
-The Parties may agree upon the delivery of Sponsored Development in an 
+7.4.1 The Parties may agree upon the delivery of Sponsored Development in an 
 Agreement. This Service is provided as Consulting in accordance with this 
 Section 7. Intellectual Property Rights to Sponsored Development results are 
 regulated by Section 11 below.
@@ -651,14 +666,20 @@ or other Agreement document. As regards Trial Licenses, no Subscription fee is
 charged.
 
 10.2. Consulting
-10.2.1. The applicable prices and hourly rates are detailed in the Agreement 
+10.2.1. All cost and effort estimates given by Vaadin to Customer are 
+indicative by nature and do not affect the calculation of the fees. If not 
+otherwise specified in the Agreement, the Services are provided on 
+time-and-material basis. The fee is determined by multiplying the hourly rates 
+set forth in the Agreement by the hours that Vaadin has worked on the Services.
+
+10.2.2. The applicable prices and hourly rates are detailed in the Agreement 
 and/or its appendices. If a price for a Service has not been agreed, the price 
 in Vaadin’s price list effective on the order date shall apply.
 
-10.2.2. Vaadin shall be entitled to adjust its prices with thirty (30) days’ 
+10.2.3. Vaadin shall be entitled to adjust its prices with thirty (30) days’ 
 notice to Customer.
 
-10.2.3. Vaadin shall, if pre-approved by Customer, be entitled to charge for 
+10.2.4. Vaadin shall, if pre-approved by Customer, be entitled to charge for 
 customary and reasonable travel and accommodation costs as well as other travel 
 costs relating to Services. Traveling time shall be charged as 50% of the 
 agreed hourly rates.
@@ -971,6 +992,7 @@ PURPOSE, ANY IMPLIED WARRANTY THAT ANY SOFTWARE, PRODUCT OR SERVICE WILL MEET
 ALL NEEDS AND EXPECTATIONS, BE ERROR-FREE, OR BE OF CERTAIN CONDITION, QUALITY 
 OR DURABILITY, OR FUNCTION OR PERFORM IN A CERTAIN WAY. ALL SUCH WARRANTIES, 
 CONDITIONS, UNDERTAKINGS AND TERMS ARE HEREBY EXCLUDED.
+
 23. Limitation of Liability
 23.1. VAADIN AND ITS AFFILIATES AND SUPPLIERS SHALL NOT BE LIABLE FOR ANY 
 INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, INCLUDING BUT 
@@ -985,9 +1007,9 @@ A PARTY TOWARDS THE OTHER PARTY IN RELATION TO THE AGREEMENT IS LIMITED TO A
 MAXIMUM OF 50 % OF THE PRICE PAYABLE FOR THE AGREED SUBSCRIPTION, PRODUCT OR 
 SERVICE DIRECTLY RELATED TO THE CAUSE OF ACTION ASSERTED UNDER THE RELEVANT 
 AGREEMENT. IN CASE OF SUBSCRIPTIONS, THE AFOREMENTIONED 50 % LIMIT IS 
-CALCULATED BASED ON THE SUBSRPTION FEE FOR THE MOST RECENT SUBSCRIPTION TERM. 
-IN CASE OF CONSULTING CARRIED OUT OUTSIDE A SUBSCRIPTION, THE AFOREMENTIONED 
-50 % LIMIT IS CALCULATED BASED ON THE TOTAL VALUE OF THE CONSULTING UNDER THE 
+CALCULATED BASED ON THE SUBSCRIPTION FEE FOR THE MOST RECENT SUBSCRIPTION TERM. 
+IN CASE OF CONSULTING CARRIED OUT OUTSIDE A SUBSCRIPTION, THE AFOREMENTIONED 50 
+% LIMIT IS CALCULATED BASED ON THE TOTAL VALUE OF THE CONSULTING UNDER THE 
 RELEVANT SOW.
 
 23.3. THIS LIMITATION OF LIABILITY SHALL APPLY REGARDLESS OF THE CAUSE OF 
@@ -1083,13 +1105,13 @@ interpretation of the Commercial Terms or any provision hereof.
 
 27.6. Severability
 27.6.1. If any provision of the Agreement shall be held invalid, illegal or 
-unenforceable, the remaining provisions shall not be affected or impaired. 
+unenforceable, the remaining provisions shall not be affected or impaired.
 
 27.7. Export Control
 27.7.1. The Licensed Software may be subject to import and export controls in 
 other countries. Customer agrees to strictly comply with all applicable import 
 and export regulations and acknowledge that Customer has the responsibility to 
-obtain licenses to export, re-export, transfer or import Licensed Software.  
+obtain licenses to export, re-export, transfer or import Licensed Software.
 
 27.8. Assignment
 27.8.1. Neither Party shall have the right to assign the Agreement to a third 
@@ -1105,8 +1127,8 @@ Agreement.
 statements required hereby shall be in English.
 
 27.10. Changes to these Commercial Terms
-Vaadin may change these Commercial Terms at any time, upon thirty (30) days 
-prior written notice. The changed Commercial Terms shall apply to any new 
+27.10.1 Vaadin may change these Commercial Terms at any time, upon thirty (30) 
+days prior written notice. The changed Commercial Terms shall apply to any new 
 Orders and Agreements entered into after the effective date of the change. As 
 regards Subscriptions, the changed Commercial Terms shall apply from the 
 beginning of a renewed Subscription term, provided that Vaadin has notified 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/crud",
-  "version": "24.2.0-dev.f254716fe",
+  "version": "24.2.0-rc1",
   "publishConfig": {
     "access": "public"
   },
@@ -37,20 +37,20 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "24.2.0-dev.f254716fe",
-    "@vaadin/component-base": "24.2.0-dev.f254716fe",
-    "@vaadin/confirm-dialog": "24.2.0-dev.f254716fe",
-    "@vaadin/dialog": "24.2.0-dev.f254716fe",
-    "@vaadin/form-layout": "24.2.0-dev.f254716fe",
-    "@vaadin/grid": "24.2.0-dev.f254716fe",
-    "@vaadin/text-field": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-material-styles": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-dev.f254716fe"
+    "@vaadin/button": "24.2.0-rc1",
+    "@vaadin/component-base": "24.2.0-rc1",
+    "@vaadin/confirm-dialog": "24.2.0-rc1",
+    "@vaadin/dialog": "24.2.0-rc1",
+    "@vaadin/form-layout": "24.2.0-rc1",
+    "@vaadin/grid": "24.2.0-rc1",
+    "@vaadin/text-field": "24.2.0-rc1",
+    "@vaadin/vaadin-lumo-styles": "24.2.0-rc1",
+    "@vaadin/vaadin-material-styles": "24.2.0-rc1",
+    "@vaadin/vaadin-themable-mixin": "24.2.0-rc1"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/testing-helpers": "^0.4.3",
+    "@vaadin/testing-helpers": "^0.5.0",
     "sinon": "^13.0.2"
   },
   "cvdlName": "vaadin-crud",
@@ -58,5 +58,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "da54950b9f8c14c6451ede0d426e16a489c7fb9b"
+  "gitHead": "012bef350bbf29865748f4c78338dd17c6f61a74"
 }

package/src/vaadin-crud-controllers.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright (c) 2000 - 2023 Vaadin Ltd.
+ *
+ * This program is available under Vaadin Commercial License and Service Terms.
+ *
+ *
+ * See https://vaadin.com/commercial-license-and-service-terms for the full
+ * license.
+ */
+import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
+
+/**
+ * A controller for initializing slotted button.
+ */
+export class ButtonSlotController extends SlotController {
+  constructor(host: HTMLElement);
+}
+
+/**
+ * A controller for initializing slotted form.
+ */
+export class FormSlotController extends SlotController {
+  constructor(host: HTMLElement);
+}
+
+/**
+ * A controller for initializing slotted grid.
+ */
+export class GridSlotController extends SlotController {
+  constructor(host: HTMLElement);
+}

package/src/vaadin-crud-controllers.js

@@ -0,0 +1,114 @@
+/**
+ * @license
+ * Copyright (c) 2000 - 2023 Vaadin Ltd.
+ *
+ * This program is available under Vaadin Commercial License and Service Terms.
+ *
+ *
+ * See https://vaadin.com/commercial-license-and-service-terms for the full
+ * license.
+ */
+import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
+
+/**
+ * A controller for initializing slotted button.
+ * @protected
+ */
+export class ButtonSlotController extends SlotController {
+  constructor(host, type, theme) {
+    super(host, `${type}-button`, 'vaadin-button');
+
+    this.type = type;
+    this.theme = theme;
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to mark custom slotted button as the default.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    // Needed by Flow counterpart to apply i18n to custom button
+    if (node._isDefault) {
+      this.defaultNode = node;
+    }
+
+    if (node === this.defaultNode) {
+      node.setAttribute('theme', this.theme);
+    }
+
+    const { host, type } = this;
+    const property = `_${type}Button`;
+    const listener = `__${type}`;
+
+    // TODO: restore default button when a corresponding slotted button is removed.
+    // This would require us to detect where to insert a button after teleporting it,
+    // which happens after opening a dialog and closing it (default editor position).
+    if (host[property] && host[property] !== node) {
+      host[property].remove();
+    }
+
+    node.addEventListener('click', host[listener]);
+    host[property] = node;
+  }
+}
+
+/**
+ * A controller for initializing slotted form.
+ * @protected
+ */
+export class FormSlotController extends SlotController {
+  constructor(host) {
+    super(host, 'form', 'vaadin-crud-form');
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to move slotted form to the overlay if needed.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    this.host._form = node;
+
+    if (this.host.editorOpened) {
+      this.host.__ensureChildren();
+    }
+  }
+}
+
+/**
+ * A controller for initializing slotted grid.
+ * @protected
+ */
+export class GridSlotController extends SlotController {
+  constructor(host) {
+    super(host, 'grid', 'vaadin-crud-grid');
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to initialize `active-item-changed` listener.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    const { host } = this;
+
+    // Wait for all the properties e.g. `noFilter` and `noSort`
+    // to be set, to ensure columns are configured correctly.
+    queueMicrotask(() => {
+      // Force to remove listener on previous grid first
+      host.__editOnClickChanged(false, host._grid);
+      host._grid = node;
+      host.__editOnClickChanged(host.editOnClick, host._grid);
+    });
+  }
+}

package/src/vaadin-crud-dialog.js

@@ -9,6 +9,7 @@
  * license.
  */
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { OverlayClassMixin } from '@vaadin/component-base/src/overlay-class-mixin.js';
 import { DialogBaseMixin } from '@vaadin/dialog/src/vaadin-dialog-base-mixin.js';
@@ -57,6 +58,7 @@ registerStyles('vaadin-crud-dialog-overlay', [overlayStyles, dialogOverlay, resi
 /**
  * An element used internally by `<vaadin-crud>`. Not intended to be used separately.
  *
+ * @customElement
  * @extends HTMLElement
  * @mixes DirMixin
  * @mixes OverlayMixin
@@ -100,7 +102,7 @@ class CrudDialogOverlay extends OverlayMixin(DirMixin(ThemableMixin(PolymerEleme
   }
 }
 
-customElements.define(CrudDialogOverlay.is, CrudDialogOverlay);
+defineCustomElement(CrudDialogOverlay);
 
 /**
  * An element used internally by `<vaadin-crud>`. Not intended to be used separately.
@@ -149,4 +151,4 @@ class CrudDialog extends DialogBaseMixin(OverlayClassMixin(ThemePropertyMixin(Po
   }
 }
 
-customElements.define(CrudDialog.is, CrudDialog);
+defineCustomElement(CrudDialog);

package/src/vaadin-crud-edit-column.js

@@ -9,6 +9,7 @@
  * license.
  */
 import './vaadin-crud-edit.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js';
 
 /**
@@ -26,6 +27,7 @@ import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js';
  *    ...
  * ```
  *
+ * @customElement
  * @extends GridColumn
  */
 class CrudEditColumn extends GridColumn {
@@ -85,6 +87,6 @@ class CrudEditColumn extends GridColumn {
   }
 }
 
-customElements.define(CrudEditColumn.is, CrudEditColumn);
+defineCustomElement(CrudEditColumn);
 
 export { CrudEditColumn };

package/src/vaadin-crud-edit.js

@@ -10,6 +10,7 @@
  */
 import { html } from '@polymer/polymer/polymer-element.js';
 import { Button } from '@vaadin/button/src/vaadin-button.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
@@ -34,6 +35,7 @@ registerStyles(
  * Typical usage is in a `<vaadin-grid-column>` of a custom `<vaadin-grid>` inside
  * a `<vaadin-crud>` to enable editing.
  *
+ * @customElement
  * @extends HTMLElement
  * @mixes ThemableMixin
  */
@@ -73,4 +75,4 @@ class CrudEdit extends Button {
    */
 }
 
-customElements.define(CrudEdit.is, CrudEdit);
+defineCustomElement(CrudEdit);

package/src/vaadin-crud-form.js

@@ -9,6 +9,7 @@
  * license.
  */
 import '@vaadin/text-field/src/vaadin-text-field.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { FormLayout } from '@vaadin/form-layout/src/vaadin-form-layout.js';
 import { capitalize } from './vaadin-crud-helpers.js';
 import { IncludedMixin } from './vaadin-crud-include-mixin.js';
@@ -16,6 +17,7 @@ import { IncludedMixin } from './vaadin-crud-include-mixin.js';
 /**
  * An element used internally by `<vaadin-crud>`. Not intended to be used separately.
  *
+ * @customElement
  * @extends FormLayout
  * @mixes IncludedMixin
  * @private
@@ -90,6 +92,6 @@ class CrudForm extends IncludedMixin(FormLayout) {
   }
 }
 
-customElements.define(CrudForm.is, CrudForm);
+defineCustomElement(CrudForm);
 
 export { CrudForm };

package/src/vaadin-crud-grid.js

@@ -8,11 +8,12 @@
  * See https://vaadin.com/commercial-license-and-service-terms for the full
  * license.
  */
-import '@vaadin/grid/src/vaadin-grid-column.js';
 import '@vaadin/grid/src/vaadin-grid-column-group.js';
-import '@vaadin/grid/src/vaadin-grid-sorter.js';
+import '@vaadin/grid/src/vaadin-grid-column.js';
 import '@vaadin/grid/src/vaadin-grid-filter.js';
+import '@vaadin/grid/src/vaadin-grid-sorter.js';
 import './vaadin-crud-edit-column.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { Grid } from '@vaadin/grid/src/vaadin-grid.js';
 import { capitalize, getProperty } from './vaadin-crud-helpers.js';
 import { IncludedMixin } from './vaadin-crud-include-mixin.js';
@@ -275,6 +276,6 @@ class CrudGrid extends IncludedMixin(Grid) {
   }
 }
 
-customElements.define(CrudGrid.is, CrudGrid);
+defineCustomElement(CrudGrid);
 
 export { CrudGrid };

package/src/vaadin-crud.js

@@ -14,63 +14,18 @@ import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js';
 import './vaadin-crud-dialog.js';
 import './vaadin-crud-grid.js';
 import './vaadin-crud-form.js';
-import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
 import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { FocusRestorationController } from '@vaadin/a11y-base/src/focus-restoration-controller.js';
 import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { MediaQueryController } from '@vaadin/component-base/src/media-query-controller.js';
 import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { ButtonSlotController, FormSlotController, GridSlotController } from './vaadin-crud-controllers.js';
 import { getProperty, setProperty } from './vaadin-crud-helpers.js';
 
-/**
- * A controller for initializing slotted button.
- * @private
- */
-class ButtonSlotController extends SlotController {
-  constructor(host, type, theme) {
-    super(host, `${type}-button`, 'vaadin-button');
-
-    this.type = type;
-    this.theme = theme;
-  }
-
-  /**
-   * Override method inherited from `SlotController`
-   * to mark custom slotted button as the default.
-   *
-   * @param {Node} node
-   * @protected
-   * @override
-   */
-  initNode(node) {
-    // Needed by Flow counterpart to apply i18n to custom button
-    if (node._isDefault) {
-      this.defaultNode = node;
-    }
-
-    if (node === this.defaultNode) {
-      node.setAttribute('theme', this.theme);
-    }
-
-    const { host, type } = this;
-    const property = `_${type}Button`;
-    const listener = `__${type}`;
-
-    // TODO: restore default button when a corresponding slotted button is removed.
-    // This would require us to detect where to insert a button after teleporting it,
-    // which happens after opening a dialog and closing it (default editor position).
-    if (host[property] && host[property] !== node) {
-      host[property].remove();
-    }
-
-    node.addEventListener('click', host[listener]);
-    host[property] = node;
-  }
-}
-
 /**
  * `<vaadin-crud>` is a Web Component for [CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete) operations.
  *
@@ -213,6 +168,7 @@ class ButtonSlotController extends SlotController {
  * @fires {CustomEvent} save - Fired when user wants to save a new or an existing item.
  * @fires {CustomEvent} cancel - Fired when user discards edition.
  *
+ * @customElement
  * @extends HTMLElement
  * @mixes ControllerMixin
  * @mixes ElementMixin
@@ -711,10 +667,6 @@ class Crud extends ControllerMixin(ElementMixin(ThemableMixin(PolymerElement)))
     this._deleteButtonController = new ButtonSlotController(this, 'delete', 'tertiary error');
 
     this.__focusRestorationController = new FocusRestorationController();
-
-    this._observer = new FlattenedNodesObserver(this, (info) => {
-      this.__onDomChange(info.addedNodes);
-    });
   }
 
   /** @protected */
@@ -748,10 +700,10 @@ class Crud extends ControllerMixin(ElementMixin(ThemableMixin(PolymerElement)))
     });
     this.addController(this._headerController);
 
-    this._gridController = new SlotController(this, 'grid', 'vaadin-crud-grid');
+    this._gridController = new GridSlotController(this);
     this.addController(this._gridController);
 
-    this.addController(new SlotController(this, 'form', 'vaadin-crud-form'));
+    this.addController(new FormSlotController(this));
 
     this.addController(this._newButtonController);
 
@@ -919,31 +871,6 @@ class Crud extends ControllerMixin(ElementMixin(ThemableMixin(PolymerElement)))
     this.editorOpened = event.detail.value;
   }
 
-  /** @private */
-  __onDomChange(addedNodes) {
-    addedNodes
-      .filter((node) => node.nodeType === Node.ELEMENT_NODE)
-      .forEach((node) => {
-        const slotAttributeValue = node.getAttribute('slot');
-        if (!slotAttributeValue) {
-          return;
-        }
-
-        if (slotAttributeValue === 'grid') {
-          // Force to remove listener on previous grid first
-          this.__editOnClickChanged(false, this._grid);
-          this._grid = node;
-          this.__editOnClickChanged(this.editOnClick, this._grid);
-        } else if (slotAttributeValue === 'form') {
-          this._form = node;
-        }
-      });
-
-    if (this.editorOpened) {
-      this.__ensureChildren();
-    }
-  }
-
   /** @private */
   __onGridEdit(event) {
     event.stopPropagation();
@@ -1432,6 +1359,6 @@ class Crud extends ControllerMixin(ElementMixin(ThemableMixin(PolymerElement)))
    */
 }
 
-customElements.define(Crud.is, Crud);
+defineCustomElement(Crud);
 
 export { Crud };