diff --git a/packages/common/src/services/extension.service.ts b/packages/common/src/services/extension.service.ts index 2fe7bd43f..98915c1db 100644 --- a/packages/common/src/services/extension.service.ts +++ b/packages/common/src/services/extension.service.ts @@ -277,7 +277,7 @@ export class ExtensionService { // } // } if (options.enableDraggableGrouping) { - if (!this.getCreatedExtensionByName(ExtensionName.rowDetailView)) { + if (!this.getCreatedExtensionByName(ExtensionName.draggableGrouping)) { const draggableInstance = this.draggableGroupingExtension.create(options); options.enableColumnReorder = draggableInstance?.getSetupColumnReorder !== undefined; if (draggableInstance) { diff --git a/packages/common/src/styles/slick-pagination.scss b/packages/common/src/styles/slick-pagination.scss index 2e810d580..75cef55b3 100644 --- a/packages/common/src/styles/slick-pagination.scss +++ b/packages/common/src/styles/slick-pagination.scss @@ -53,6 +53,7 @@ .pagination { margin: 0; + display: inline-flex; .page-link { font-size: ($font-size-base - 1px); diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip index 5848eec78..b62ef29d2 100644 Binary files a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip and b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip differ diff --git a/packages/vanilla-bundle/src/components/slick-pagination.ts b/packages/vanilla-bundle/src/components/slick-pagination.ts index 72a307bd1..198a6fff0 100644 --- a/packages/vanilla-bundle/src/components/slick-pagination.ts +++ b/packages/vanilla-bundle/src/components/slick-pagination.ts @@ -138,8 +138,8 @@ export class SlickPaginationComponent { this._paginationElement = temp.firstChild as HTMLDivElement; this._paginationElement.classList.add(this.gridUid, 'pager'); - if (gridParentContainerElm?.append && this._paginationElement) { - gridParentContainerElm.append(this._paginationElement); + if (gridParentContainerElm?.appendChild && this._paginationElement) { + gridParentContainerElm.appendChild(this._paginationElement); this.renderPageSizes(); this.addBindings(); this.addEventListeners(); diff --git a/packages/vanilla-bundle/src/services/binding.service.ts b/packages/vanilla-bundle/src/services/binding.service.ts index 2a3ba86f4..70bde47c3 100644 --- a/packages/vanilla-bundle/src/services/binding.service.ts +++ b/packages/vanilla-bundle/src/services/binding.service.ts @@ -32,9 +32,9 @@ export class BindingService { this._property = binding.property || ''; this.elementBindings = []; if (binding.property && binding.variable && (binding.variable.hasOwnProperty(binding.property) || binding.property in binding.variable)) { - this._value = typeof binding.variable[binding.property] === 'string' ? DOMPurify.sanitize(binding.variable[binding.property], {}) : binding.variable[binding.property]; + this._value = typeof binding.variable[binding.property] === 'string' ? this.sanitizeText(binding.variable[binding.property]) : binding.variable[binding.property]; } else { - this._value = typeof binding.variable === 'string' ? DOMPurify.sanitize(binding.variable, {}) : binding.variable; + this._value = typeof binding.variable === 'string' ? this.sanitizeText(binding.variable) : binding.variable; } if (typeof binding.variable === 'object') { @@ -54,11 +54,11 @@ export class BindingService { } valueSetter(val: any) { - this._value = typeof val === 'string' ? DOMPurify.sanitize(val, {}) : val; + this._value = typeof val === 'string' ? this.sanitizeText(val) : val; if (Array.isArray(this.elementBindings)) { for (const binding of this.elementBindings) { if (binding?.element && binding?.attribute) { - binding.element[binding.attribute] = typeof val === 'string' ? DOMPurify.sanitize(val, {}) : val; + binding.element[binding.attribute] = typeof val === 'string' ? this.sanitizeText(val) : val; } } } @@ -92,7 +92,7 @@ export class BindingService { element.addEventListener(eventName, listener); } this.elementBindings.push(binding); - element[attribute] = typeof this._value === 'string' ? DOMPurify.sanitize(this._value, {}) : this._value; + element[attribute] = typeof this._value === 'string' ? this.sanitizeText(this._value) : this._value; } return this; } @@ -103,4 +103,8 @@ export class BindingService { element.removeEventListener(eventName, listener, options); } } + + private sanitizeText(dirtyText: string): string { + return (DOMPurify?.sanitize) ? DOMPurify.sanitize(dirtyText, {}) : dirtyText; + } }