Merge branch 'master' of github.com:Squidex/squidex

frontend/app/features/content/module.ts

@@ -8,6 +8,8 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { CanDeactivateGuard, ContentMustExistGuard, LoadLanguagesGuard, LoadSchemasGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SqxFrameworkModule, SqxSharedModule } from '@app/shared';
+import { ScrollingModule } from '@angular/cdk/scrolling';
+import { ScrollingModule as ScrollingModuleExperimental } from '@angular/cdk-experimental/scrolling';
 import { ArrayEditorComponent, ArrayItemComponent, AssetsEditorComponent, CommentsPageComponent, ComponentComponent, ComponentSectionComponent, ContentComponent, ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentExtensionComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentListCellDirective, ContentListFieldComponent, ContentListHeaderComponent, ContentListWidthPipe, ContentPageComponent, ContentReferencesComponent, ContentsColumnsPipe, ContentSectionComponent, ContentSelectorComponent, ContentSelectorItemComponent, ContentsFiltersPageComponent, ContentsPageComponent, ContentStatusComponent, ContentValueComponent, ContentValueEditorComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldEditorComponent, FieldLanguagesComponent, IFrameEditorComponent, PreviewButtonComponent, ReferenceItemComponent, ReferencesEditorComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations';
 
 const routes: Routes = [
@@ -76,6 +78,8 @@ const routes: Routes = [
 @NgModule({
     imports: [
         RouterModule.forChild(routes),
+        ScrollingModule,
+        ScrollingModuleExperimental,
         SqxFrameworkModule,
         SqxSharedModule,
     ],

frontend/app/features/content/shared/forms/array-editor.component.html

@@ -1,29 +1,51 @@
 <ng-container *ngIf="formModel.itemChanges | async; let items">
-    <div class="array-container" *ngIf="items.length > 0"
+    <div class="array-container" *ngIf="items.length > 0">
-        cdkDropList
+        <div class="cdk-container" *ngIf="items.length <= 50;"
-        [cdkDropListDisabled]="false"
+            cdkDropList
-        [cdkDropListData]="items"
+            [cdkDropListDisabled]="false"
-        (cdkDropListDropped)="sort($event)">
+            [cdkDropListData]="items"
-        <div *ngFor="let itemForm of items; index as i; last as isLast; first as isFirst" class="table-drag item"
+            (cdkDropListDropped)="sort($event)">
-            cdkDrag
+            <div *ngFor="let itemForm of items; index as i; last as isLast; first as isFirst" class="table-drag item"
-            cdkDragLockAxis="y">
+                cdkDrag
-            <sqx-array-item
+                cdkDragLockAxis="y">
-                [canUnset]="canUnset"
+                <sqx-array-item
-                [form]="form"
+                    [canUnset]="canUnset"
-                [formContext]="formContext"
+                    [form]="form"
-                [formModel]="itemForm"
+                    [formContext]="formContext"
-                [index]="i"
+                    [formModel]="itemForm"
-                [isDisabled]="isDisabled | async"
+                    [index]="i"
-                [isFirst]="isFirst"
+                    [isDisabled]="isDisabled | async"
-                [isLast]="isLast"
+                    [isFirst]="isFirst"
-                [language]="language"
+                    [isLast]="isLast"
-                [languages]="languages"
+                    [language]="language"
-                (clone)="addCopy(itemForm)"
+                    [languages]="languages"
-                (itemRemove)="removeItem(i)"
+                    (clone)="addCopy(itemForm)"
-                (itemMove)="move(itemForm, $event)" >
+                    (itemRemove)="removeItem(i)"
-                <i cdkDragHandle class="icon-drag2"></i>
+                    (itemMove)="move(itemForm, $event)" >
-            </sqx-array-item>
+                    <i cdkDragHandle class="icon-drag2"></i>
+                </sqx-array-item>
+            </div>
         </div>
+
+        <cdk-virtual-scroll-viewport autosize *ngIf="items.length > 50">
+            <div *cdkVirtualFor="let itemForm of items; index as i; last as isLast; first as isFirst" class="table-drag item">
+                <sqx-array-item
+                    [canUnset]="canUnset"
+                    [form]="form"
+                    [formContext]="formContext"
+                    [formModel]="itemForm"
+                    [index]="i"
+                    [isDisabled]="isDisabled | async"
+                    [isFirst]="isFirst"
+                    [isLast]="isLast"
+                    [language]="language"
+                    [languages]="languages"
+                    (clone)="addCopy(itemForm)"
+                    (itemRemove)="removeItem(i)"
+                    (itemMove)="move(itemForm, $event)" >
+                </sqx-array-item>
+            </div>
+        </cdk-virtual-scroll-viewport>
     </div>
 
     <div class="row no-gutters align-items-center">

frontend/app/features/content/shared/forms/array-editor.component.scss

@@ -1,11 +1,25 @@
+:host ::ng-deep {
+    .cdk-virtual-scroll-content-wrapper {
+        right: 0;
+    }
+}
+
 .array-container {
     background: $color-border;
+    margin: 0;
     margin-bottom: 1rem;
-    padding: 1rem;
+    padding-bottom: 1rem;
-    padding-bottom: 1px;
+    position: relative;
+}
+
+.drag-container {
     position: relative;
 }
 
+cdk-virtual-scroll-viewport {
+    height: 1000px;
+}
+
 .item {
-    margin-bottom: 1rem;
+    padding: 1rem 1rem 0;
 }

frontend/package-lock.json

@@ -46,6 +46,14 @@
         "tslib": "^2.1.0"
       }
     },
+    "@angular/cdk-experimental": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/cdk-experimental/-/cdk-experimental-12.1.1.tgz",
+      "integrity": "sha512-troV5cZ5Ss5B9Grv61hvtOwqTHQmdA2/Kzm+9mrPIHNEimpFEfG5lATfGA2C3QFk9Cs0yloiXu39oEJYEqyuBA==",
+      "requires": {
+        "tslib": "^2.2.0"
+      }
+    },
     "@angular/common": {
       "version": "12.0.2",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.0.2.tgz",

frontend/package.json

@@ -20,6 +20,7 @@
   "dependencies": {
     "@angular/animations": "12.0.2",
     "@angular/cdk": "12.0.2",
+    "@angular/cdk-experimental": "^12.1.1",
     "@angular/common": "12.0.2",
     "@angular/core": "12.0.2",
     "@angular/forms": "12.0.2",