diff --git a/packages/core/src/templates/component/image_inline.html.twig b/packages/core/src/templates/component/image_inline.html.twig index 6ab0f574c..16457e6fc 100755 --- a/packages/core/src/templates/component/image_inline.html.twig +++ b/packages/core/src/templates/component/image_inline.html.twig @@ -46,7 +46,7 @@ {% set width = image.width %} {% set height = image.height %} {% endif %} - + -
{% if false == is_embed %}{% endif %} diff --git a/packages/js-helper/package.json b/packages/js-helper/package.json index 81a6a7db5..a39a9d3b8 100755 --- a/packages/js-helper/package.json +++ b/packages/js-helper/package.json @@ -1,6 +1,6 @@ { "name": "@pushword/js-helper", - "version": "0.0.107", + "version": "0.0.108", "description": "Pushword front end helpers. ", "author": "Robin@PiedWeb ", "license": "MIT", diff --git a/packages/js-helper/src/ScrollEnhancer.js b/packages/js-helper/src/ScrollEnhancer.js index ebc75a1d2..8f7fd2c08 100644 --- a/packages/js-helper/src/ScrollEnhancer.js +++ b/packages/js-helper/src/ScrollEnhancer.js @@ -2,29 +2,35 @@ * Demo in Draft */ +/** + * Demo in Draft + */ + class ScrollYEnhancer { - constructor( - selector = '.enhance-scroll-y', - arrow = '
', - fadeout = '
', - ) { + constructor(selector = '.enhance-scroll-y', arrow = '
', fadeout = '
') { window.scrollPreviousDiv = this.scrollPreviousDiv window.manageScrollYControllerVisibility = this.manageScrollYControllerVisibility document.querySelectorAll(selector).forEach((element) => { + if (element.scrollHeight <= element.clientHeight - 20) { + // 20 = padding-bottom + element.classList.remove('enhance-scroll-y') + return + } + this.arrow = element.dataset.arrow ?? arrow this.fadeout = element.dataset.fadeout ?? fadeout element.classList.remove(selector) this.enhanceScrollY(element) this.mouseSliderY(element) - this.wheelScroll(element) + this.wheelScrollY(element) element.onscroll = function () { manageScrollYControllerVisibility(this) } }) } - wheelScroll(element) { + wheelScrollY(element) { element.addEventListener('wheel', (evt) => { if (window.isScrolling === true) return evt.preventDefault() @@ -34,11 +40,7 @@ class ScrollYEnhancer { element.scrollTop += evt.deltaY if (before === element.scrollTop) { - if ( - (parent = element.closest('.enhance-scroll-x')) && - new Date().getTime() - window.lastScrollTime > 200 && - scrollX(parent.parentNode.querySelector(evt.deltaY > 0 ? '.scroll-right' : '.scroll-left')) - ) { + if ((parent = element.closest('.enhance-scroll-x')) && new Date().getTime() - window.lastScrollTime > 200 && scrollX(parent.parentNode.querySelector(evt.deltaY > 0 ? '.scroll-right' : '.scroll-left'))) { window.lastScrollTime = new Date().getTime() window.isScrolling = false return @@ -72,7 +74,7 @@ class ScrollYEnhancer { manageScrollYControllerVisibility(element) { const scroller = element.parentNode.querySelector('.scroller') - const isAtMaxScroll = element.scrollTop >= element.scrollHeight - element.clientHeight - 12 + const isAtMaxScroll = element.scrollTop >= element.scrollHeight - element.clientHeight - 8 if (scroller.textContent === '⌄' || isAtMaxScroll) { if (isAtMaxScroll) { scroller.textContent = '⌃' @@ -120,29 +122,31 @@ class ScrollYEnhancer { } class ScrollXEnhancer { - constructor( - selector = '.enhance-scroll-x', - arrowRight = '
', - arrowLeft = '
', - ) { + constructor(selector = '.enhance-scroll-x', arrowRight = '
', arrowLeft = '
') { window.scrollLeft = this.scrollLeft window.scrollX = this.scrollX window.manageScrollXControllerVisibility = this.manageScrollXControllerVisibility document.querySelectorAll(selector).forEach((element) => { + if (element.scrollWidth <= element.clientWidth - 12) { + // 20 = padding-bottom + element.classList.remove('enhance-scroll-x') + return + } + this.arrowLeft = element.dataset.arrowleft ?? arrowLeft this.arrowRight = element.dataset.arrowright ?? arrowRight element.classList.remove(selector) this.enhanceScrollX(element) this.mouseSliderX(element) - this.wheelScroll(element) + this.wheelScrollX(element) element.onscroll = function () { manageScrollXControllerVisibility(this) } }) } - wheelScroll(element) { + wheelScrollX(element) { element.addEventListener('wheel', (evt) => { if (window.isScrolling === true) return evt.preventDefault() @@ -178,9 +182,6 @@ class ScrollXEnhancer { const scrollToRight = scroller.classList.contains('scroll-right') - const oppositeSelector = scrollToRight ? 'scroll-left' : 'scroll-right' - const oppositeController = element.querySelector('.' + oppositeSelector) - const nextElementToScroll = element.children[3] // work only with equal width block const toScrollWidth = nextElementToScroll.offsetWidth + parseInt(window.getComputedStyle(nextElementToScroll).marginLeft) const before = element.scrollLeft @@ -228,6 +229,7 @@ class ScrollXEnhancer { } } + module.exports = { ScrollXEnhancer: ScrollXEnhancer, ScrollYEnhancer: ScrollYEnhancer, diff --git a/packages/js-helper/src/tailwind.prose.scss b/packages/js-helper/src/tailwind.prose.scss index 643f2a550..28e9bb806 100755 --- a/packages/js-helper/src/tailwind.prose.scss +++ b/packages/js-helper/src/tailwind.prose.scss @@ -25,7 +25,6 @@ border-color: var(--primary); outline: none; text-decoration: none !important; - font-size: 120%; } .link-btn:hover {