Slickgrid replacement #6971

enonic · Oct 14, 2024 · d542182 · d542182
1 parent 7b4af21
commit d542182
Show file tree

Hide file tree

Showing 440 changed files with 11,404 additions and 9,129 deletions.
diff --git a/modules/app/src/main/resources/assets/page-editor/styles/partials/item-view.less b/modules/app/src/main/resources/assets/page-editor/styles/partials/item-view.less
@@ -17,10 +17,21 @@
  display: flex;
  justify-content: center;
  align-items: center;
+ height: @placeholder-height;
 
  .empty-descriptor-block {
  position: relative; // works as setting the z-index to 1
  }
+
+ .selectable-listbox-wrapper {
+ text-align: left;
+
+ .selectable-listbox {
+ margin: 0;
+ padding: 0;
+ z-index: @z-index-empty-component-options;
+ }
+ }
  }
  }
 
@@ -104,11 +115,17 @@
  text-align: center;
  box-sizing: border-box;
 
+ .selectable-listbox {
+ margin: 0;
+ padding: 0;
+ z-index: @z-index-empty-component-options;
+ }
+
  .display-name {
  display: none;
  color: @page-editor-message-blue;
  margin: 0;
- line-height: 37px;
+ line-height: 36px;
  position: relative; // set the position to appear on top of the absolutely positioned :before
 
  .ellipsis();
@@ -159,7 +176,7 @@
  input[type="text"] {
  font-family: @admin-font-family;
  font-size: 15px;
- padding: 4px 37px 4px 10px;
+ padding: 4px 36px 4px 10px;
 
  .placeholder(1em, italic);
  .input-glow(); // need to use glow explicitly because it is used out of the form

diff --git a/modules/app/src/main/resources/assets/page-editor/styles/partials/layout-view.less b/modules/app/src/main/resources/assets/page-editor/styles/partials/layout-view.less
@@ -1,3 +1,10 @@
 .@{_CLS_PREFIX}layout-placeholder {
  //
 }
+
+.@{_CLS_PREFIX}layout-placeholder {
+ .common-page-dropdown {
+ max-width: 540px;
+ margin: 0 auto;
+ }
+}
diff --git a/modules/app/src/main/resources/assets/page-editor/styles/partials/part-view.less b/modules/app/src/main/resources/assets/page-editor/styles/partials/part-view.less
@@ -2,3 +2,10 @@ a[data-portal-component-type="part"] {
  display: block;
  pointer-events: auto;
 }
+
+.@{_CLS_PREFIX}part-placeholder {
+ .common-page-dropdown {
+ max-width: 540px;
+ margin: 0 auto;
+ }
+}
diff --git a/modules/app/src/main/resources/assets/page-editor/styles/partials/text-view.less b/modules/app/src/main/resources/assets/page-editor/styles/partials/text-view.less
@@ -76,10 +76,6 @@
  margin-top: 0;
  }
 
- > *:last-child {
- margin-bottom: 0;
- }
-
  a {
  pointer-events: auto;
  cursor: auto;

diff --git a/modules/app/tsconfig.json b/modules/app/tsconfig.json
@@ -6,7 +6,6 @@
  "types": [
  "ckeditor",
  "jquery",
- "slickgrid",
  "jqueryui",
  "q"
  ],

diff --git a/modules/lib/package.json b/modules/lib/package.json
@@ -30,7 +30,8 @@
  "jquery-ui": "^1.13.2",
  "jsondiffpatch": "^0.5.0",
  "lodash": "^4.17.21",
- "q": "^1.5.1"
+ "q": "^1.5.1",
+ "sortablejs": "^1.15.2"
  },
  "devDependencies": {
  "@enonic/eslint-config": "^2.0.0",
@@ -42,6 +43,7 @@
  "@types/jquery": "^3.5.25",
  "@types/jqueryui": "^1.12.19",
  "@types/q": "^1.5.7",
+ "@types/sortablejs": "^1.15.8",
  "circular-dependency-plugin": "^5.2.2",
  "eslint": "^9.10.0",
  "globals": "^15.10.0",

diff --git a/modules/lib/src/main/resources/assets/js/app/ContentAppContainer.ts b/modules/lib/src/main/resources/assets/js/app/ContentAppContainer.ts
@@ -57,16 +57,7 @@ export class ContentAppContainer
 
  private initSearchPanelListener(panel: ContentAppPanel) {
  ToggleSearchPanelWithDependenciesGlobalEvent.on((event) => {
- if (!panel.getBrowsePanel().getTreeGrid().isEmpty()) {
- new ToggleSearchPanelWithDependenciesEvent({item: event.getContent(), inbound: event.isInbound()}).fire();
- } else {
- const handler = () => {
- new ToggleSearchPanelWithDependenciesEvent({item: event.getContent(), inbound: event.isInbound()}).fire();
- panel.getBrowsePanel().getTreeGrid().unLoaded(handler);
- };
-
- panel.getBrowsePanel().getTreeGrid().onLoaded(handler);
- }
+ new ToggleSearchPanelWithDependenciesEvent({item: event.getContent(), inbound: event.isInbound()}).fire();
  });
  }