Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
layout_paragraphs
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
layout_paragraphs
Commits
4aceef18
Commit
4aceef18
authored
4 days ago
by
Justin Toupin
Browse files
Options
Downloads
Patches
Plain Diff
Mark horizontal regions. Use appropriate indicators for left/right drag and drop.
parent
33f2b71a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#451304
failed
4 days ago
Stage: build
Stage: validate
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
css/builder.css
+24
-5
24 additions, 5 deletions
css/builder.css
js/builder.js
+58
-22
58 additions, 22 deletions
js/builder.js
with
82 additions
and
27 deletions
css/builder.css
+
24
−
5
View file @
4aceef18
...
@@ -263,10 +263,21 @@
...
@@ -263,10 +263,21 @@
top: 0;
top: 0;
transform: translate(-50%, calc(-50% - 1.5px));
transform: translate(-50%, calc(-50% - 1.5px));
}
}
.lpb-horizontal-region .lpb-btn--add.before {
top: 50%;
left: 0;
transform: translate(calc(-50% - 1.5px), -50%);
}
.lpb-btn--add.after {
.lpb-btn--add.after {
bottom: 0;
bottom: 0;
transform: translate(-50%, calc(50% + 1.5px));
transform: translate(-50%, calc(50% + 1.5px));
}
}
.lpb-horizontal-region .lpb-btn--add.after {
top: 50%;
left: 100%;
bottom: auto;
transform: translate(calc(-50% + 1.5px), -50%);
}
/* - Sortable Drag States - */
/* - Sortable Drag States - */
...
@@ -280,22 +291,30 @@
...
@@ -280,22 +291,30 @@
outline: none !important;
outline: none !important;
}
}
.sortable-target--region {
.sortable-target--region {
box-shadow: inset 0
3
px 0 blue;
box-shadow: inset 0
6
px 0 blue;
}
}
.sortable-target--before {
.sortable-target--before {
box-shadow: 0 -3px 0 blue;
box-shadow: 0 -6px 0 blue;
}
.lpb-horizontal-region .sortable-target--before {
box-shadow: -6px 0 0 blue;
}
}
.sortable-target--after {
.sortable-target--after {
box-shadow: 0 3px 0 blue;
box-shadow: 0 6px 0 blue;
}
.lpb-horizontal-region .sortable-target--after {
box-shadow: 6px 0 0 blue;
}
}
.js-lpb-component.is-dragging
:not(.sortable-ghost)
{
.js-lpb-component.is-dragging {
cursor: grabbing;
cursor: grabbing;
background: #fff;
}
}
.js-lpb-component.is-dragging .js-lpb-region,
.js-lpb-component.is-dragging .js-lpb-region,
.js-lpb-component.is-dragging .js-lpb-component {
.js-lpb-component.is-dragging .js-lpb-component {
outline: none;
outline: none;
}
}
.js-lpb-component.is-dragging .js-lpb-ui {
display: none;
}
/* - Formatter Widget - */
/* - Formatter Widget - */
...
...
This diff is collapsed.
Click to expand it.
js/builder.js
+
58
−
22
View file @
4aceef18
...
@@ -482,18 +482,13 @@
...
@@ -482,18 +482,13 @@
/**
/**
* Initializes Sortable.js for drag-and-drop.
* Initializes Sortable.js for drag-and-drop.
* @param {HTMLElement} element The builder element.
* @param {String} id The layout ID.
* @param {Array} containers The builder containers.
* @param {Object} settings The builder settings.
* @param {Object} settings The builder settings.
*/
*/
function
initSortable
(
element
,
settings
)
{
function
initSortable
(
id
,
containers
,
settings
)
{
// Find all containers that should support drag-and-drop.
const
containers
=
once
(
'
is-sortable-enabled
'
,
'
.js-lpb-region, .js-lpb-component-list
'
,
element
,
);
const
id
=
element
.
getAttribute
(
'
data-lpb-id
'
);
containers
.
forEach
((
container
)
=>
{
containers
.
forEach
((
container
)
=>
{
const
element
=
container
.
closest
(
`[
${
idAttr
}
]`
);
Drupal
.
LPSortableInstances
.
add
(
Drupal
.
LPSortableInstances
.
add
(
id
,
id
,
new
Sortable
(
container
,
{
new
Sortable
(
container
,
{
...
@@ -596,6 +591,42 @@
...
@@ -596,6 +591,42 @@
});
});
}
}
/**
* Adds a class to regions whose components flow horizontally.
* @param {Element} regions Region elements to check for horizontal flow.
*/
function
markHorizontalRegions
(
regions
)
{
regions
.
forEach
((
region
)
=>
{
const
components
=
Array
.
from
(
region
.
querySelectorAll
(
'
.js-lpb-component
'
),
);
if
(
components
.
length
===
0
)
{
return
;
}
const
computedStyle
=
window
.
getComputedStyle
(
region
);
const
firstComponentStyle
=
window
.
getComputedStyle
(
components
[
0
]);
// Check if the container is using flexbox
if
(
computedStyle
.
display
.
includes
(
'
flex
'
))
{
const
{
flexDirection
}
=
computedStyle
;
// row, column, etc.
if
(
flexDirection
.
includes
(
'
row
'
))
{
region
.
classList
.
add
(
'
lpb-horizontal-region
'
);
}
}
// Check if the container is using grid
else
if
(
computedStyle
.
display
.
includes
(
'
grid
'
))
{
const
gridTemplateColumns
=
computedStyle
.
gridTemplateColumns
.
split
(
'
'
).
length
;
if
(
gridTemplateColumns
>
1
)
{
region
.
classList
.
add
(
'
lpb-horizontal-region
'
);
}
}
// Check if float is applied to child elements
else
if
(
firstComponentStyle
.
float
!==
'
none
'
)
{
region
.
classList
.
add
(
'
lpb-horizontal-region
'
);
}
});
}
// An object with arrays for "accepts" and "moves" Sortable callback functions.
// An object with arrays for "accepts" and "moves" Sortable callback functions.
Drupal
.
_lpbMoveErrors
=
{
Drupal
.
_lpbMoveErrors
=
{
accepts
:
[],
accepts
:
[],
...
@@ -708,11 +739,21 @@
...
@@ -708,11 +739,21 @@
}
}
// Initialize Sortable.js for drag-and-drop.
// Initialize Sortable.js for drag-and-drop.
selectAll
(
'
[data-lpb-id]
'
).
forEach
((
container
)
=>
{
selectAll
(
'
[data-lpb-id]
'
).
forEach
((
layoutElement
)
=>
{
const
id
=
container
.
getAttribute
(
'
data-lpb-id
'
);
const
id
=
layoutElement
.
getAttribute
(
'
data-lpb-id
'
);
initSortable
(
container
,
settings
.
lpBuilder
[
id
]);
const
containers
=
once
(
'
is-sortable-enabled
'
,
'
.js-lpb-region, .js-lpb-component-list
'
,
layoutElement
,
);
initSortable
(
id
,
containers
,
settings
.
lpBuilder
[
id
]);
});
});
// Add classes to regions whose components flow horizontally.
markHorizontalRegions
(
once
(
'
lpb-horizontal-regions
'
,
'
.js-lpb-region:has(.js-lpb-component)
'
),
);
// Dispatch lpb-init event on all layout paragraphs builders.
// Dispatch lpb-init event on all layout paragraphs builders.
once
(
'
lpb-init
'
,
'
[data-lpb-id]
'
,
context
).
forEach
((
el
)
=>
{
once
(
'
lpb-init
'
,
'
[data-lpb-id]
'
,
context
).
forEach
((
el
)
=>
{
dispatch
(
el
,
'
lpb-init
'
,
{
dispatch
(
el
,
'
lpb-init
'
,
{
...
@@ -805,15 +846,8 @@
...
@@ -805,15 +846,8 @@
*/
*/
listen
(
document
,
'
dragstart
'
,
(
event
)
=>
{
listen
(
document
,
'
dragstart
'
,
(
event
)
=>
{
if
(
event
.
target
.
classList
.
contains
(
'
js-lpb-component
'
))
{
if
(
event
.
target
.
classList
.
contains
(
'
js-lpb-component
'
))
{
const
clone
=
event
.
target
.
cloneNode
(
true
);
event
.
target
.
classList
.
add
(
'
is-dragging
'
);
Array
.
from
(
clone
.
querySelectorAll
(
'
.js-lpb-ui
'
)).
forEach
((
uiElement
)
=>
{
event
.
dataTransfer
.
setDragImage
(
event
.
target
,
event
.
layerX
,
event
.
layerY
);
uiElement
.
remove
();
});
clone
.
classList
.
add
(
'
is-dragging
'
);
clone
.
style
.
width
=
`
${
event
.
target
.
offsetWidth
}
px`
;
clone
.
style
.
height
=
`
${
event
.
target
.
offsetHeight
}
px`
;
document
.
body
.
append
(
clone
);
event
.
dataTransfer
.
setDragImage
(
clone
,
event
.
layerX
,
event
.
layerY
);
}
}
});
});
...
@@ -821,7 +855,9 @@
...
@@ -821,7 +855,9 @@
* Removes the custom drag image when dragging has ended.
* Removes the custom drag image when dragging has ended.
*/
*/
listen
(
document
,
'
dragend
'
,
()
=>
{
listen
(
document
,
'
dragend
'
,
()
=>
{
document
.
querySelector
(
'
.js-lpb-component.is-dragging
'
)?.
remove
();
document
.
querySelector
(
'
.js-lpb-component.is-dragging
'
)
?.
classList
?.
remove
(
'
is-dragging
'
);
});
});
/**
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment