Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-02-24 07:44:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SelectionModel fixed

Browse Source
This commit is contained in:
barsdeveloper
2021-10-01 20:07:09 +02:00
parent 01c3147baa
commit 44355afa3e
6 changed files with 236 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
js/OrderedIndexArray.js
View File

@@ -8,7 +8,7 @@ export default class OrderedIndexArray {
this.array = new Uint32Array(value)
this.comparisonValueSupplier = comparisonValueSupplier
this.length = 0
this.current = 0
this.currentPosition = 0
}
/**
@@ -47,20 +47,17 @@ export default class OrderedIndexArray {
return l
}
currentIsInside() {
return this.current > 0 && this.current < this.array.length
}
/**
* Inserts the element in the array.
* @param array {number[]} The array to insert into.
* @param value {number} The value to insert into the array.
* @param element {number} The value to insert into the array.
* @returns {number} The position into occupied by value into the array.
*/
insert(element, comparisonValue = null) {
let position = this.getPosition(element)
if (position < this.current || comparisonValue != null && position == this.current && this.comparisonValueSupplier(element) < comparisonValue) {
++this.current
let position = this.getPosition(this.comparisonValueSupplier(element))
if (
position < this.currentPosition
|| comparisonValue != null && position == this.currentPosition && this.comparisonValueSupplier(element) < comparisonValue) {
++this.currentPosition
}
let newArray = new Uint32Array(this.array.length + 1)
newArray.set(this.array.subarray(0, position), 0)
@@ -76,7 +73,7 @@ export default class OrderedIndexArray {
* @param {number} value The value of the element to be remove.
*/
remove(element) {
let position = this.getPosition(element)
let position = this.getPosition(this.comparisonValueSupplier(element))
if (this.array[position] == element) {
this.removeAt(position)
}
@@ -87,27 +84,42 @@ export default class OrderedIndexArray {
* @param {number} position The index of the element to be remove.
*/
removeAt(position) {
if (position < this.current) {
--this.current
if (position < this.currentPosition) {
--this.currentPosition
}
let newArray = new Uint32Array(this.array.length - 1)
newArray.set(this.array.subarray(0, position), 0)
newArray.set(this.array.subarray(position + 1), position)
this.array = newArray
this.length = this.array.length
return position
}
getNext() {
if (this.current >= 0 && this.current < this.array.length) {
return this.comparisonValueSupplier(this.get(this.current))
if (this.currentPosition >= 0 && this.currentPosition < this.array.length) {
return this.get(this.currentPosition)
}
return null
}
getNextValue() {
if (this.currentPosition >= 0 && this.currentPosition < this.array.length) {
return this.comparisonValueSupplier(this.get(this.currentPosition))
} else {
return Number.MAX_SAFE_INTEGER
}
}
getPrev() {
if (this.current > 0) {
return this.comparisonValueSupplier(this.get(this.current - 1))
if (this.currentPosition > 0) {
return this.get(this.currentPosition - 1)
}
return null
}
getPrevValue() {
if (this.currentPosition > 0) {
return this.comparisonValueSupplier(this.get(this.currentPosition - 1))
} else {
return Number.MIN_SAFE_INTEGER
}

75
js/SelectionModel.js
View File

@@ -36,9 +36,10 @@ export default class SelectionModel {
let rectangleMetadata = {
primaryBoundary: this.initialPosition[0],
secondaryBoundary: this.initialPosition[1],
rectangle: index, // used to move both directions inside the this.metadata array
rectangle: index, // used to move both expandings inside the this.metadata array
onSecondaryAxis: false
}
this.metadata[index] = rectangleMetadata
selectToggleFunction(rect, false) // Initially deselected (Eventually)
const rectangleBoundaries = boundariesFunc(rect)
if (this.initialPosition[0] < rectangleBoundaries.primaryInf) { // Initial position is before the rectangle
@@ -62,50 +63,62 @@ export default class SelectionModel {
} else {
rectangleMetadata.onSecondaryAxis = true
}
this.metadata[index] = rectangleMetadata
})
this.primaryOrder.current = this.primaryOrder.getPosition(this.initialPosition[0])
this.secondaryOrder.current = this.secondaryOrder.getPosition(this.initialPosition[1])
this.primaryOrder.currentPosition = this.primaryOrder.getPosition(this.initialPosition[0])
this.secondaryOrder.currentPosition = this.secondaryOrder.getPosition(this.initialPosition[1])
this.computeBoundaries(this.initialPosition)
}
computeBoundaries() {
this.boundaries = {
// Primary axis negative direction
// Primary axis negative expanding
primaryN: {
'value': this.primaryOrder.getPrev(),
'index': this.primaryOrder.current - 1
'value': this.primaryOrder.getPrevValue(),
'index': this.primaryOrder.getPrev()
},
primaryP: {
'value': this.primaryOrder.getNext(),
'index': this.primaryOrder.current
'value': this.primaryOrder.getNextValue(),
'index': this.primaryOrder.getNext()
},
// Secondary axis negative direction
// Secondary axis negative expanding
secondaryN: {
'value': this.secondaryOrder.getPrev(),
'index': this.secondaryOrder.current - 1
'value': this.secondaryOrder.getPrevValue(),
'index': this.secondaryOrder.getPrev()
},
// Secondary axis positive direction
// Secondary axis positive expanding
secondaryP: {
'value': this.secondaryOrder.getNext(),
'index': this.secondaryOrder.current
'value': this.secondaryOrder.getNextValue(),
'index': this.secondaryOrder.getNext()
}
}
}
selectTo(finalPosition) {
const primaryBoundaryCrossed = (index, extended) => {
if (extended) {
this.primaryOrder.current += Math.sign(finalPosition[0] - this.initialPosition[0])
if (this.metadata[index].onSecondaryAxis) {
this.selectToggleFunction(this.rectangles[index], true)
} else {
this.secondaryOrder.insert(index, this.initialPosition[1])
}
const direction = [
Math.sign(finalPosition[0] - this.initialPosition[0]),
Math.sign(finalPosition[1] - this.initialPosition[1])
]
const primaryBoundaryCrossed = (index, expanding) => {
this.primaryOrder.currentPosition += direction[0] * (expanding ? 1 : -1)
if (this.metadata[index].onSecondaryAxis) {
this.selectToggleFunction(this.rectangles[index], expanding)
} else {
this.primaryOrder.current -= Math.sign(finalPosition[0] - this.initialPosition[0])
this.secondaryOrder.remove(index)
this.selectToggleFunction(this.rectangles[index], false)
if (expanding) {
this.secondaryOrder.insert(index, finalPosition[1])
const secondaryBoundary = this.metadata[index].secondaryBoundary
if (
// If inserted before the current position
Math.sign(finalPosition[1] - secondaryBoundary) == direction[1]
// And after initial position
&& Math.sign(secondaryBoundary - this.initialPosition[1]) == direction[1]
) {
// Secondary axis is already satisfied then
this.selectToggleFunction(this.rectangles[index], true)
}
} else {
this.selectToggleFunction(this.rectangles[index], false)
this.secondaryOrder.remove(index)
}
}
this.computeBoundaries(finalPosition)
this.selectTo(finalPosition)
@@ -118,13 +131,9 @@ export default class SelectionModel {
}
const secondaryBoundaryCrossed = (index, extended) => {
if (extended) {
this.secondaryOrder.current += Math.sign(finalPosition[1] - this.initialPosition[1])
} else {
this.secondaryOrder.current -= Math.sign(finalPosition[1] - this.initialPosition[1])
}
this.selectToggleFunction(this.rectangles[index], extended)
const secondaryBoundaryCrossed = (index, expanding) => {
this.secondaryOrder.currentPosition += direction[1] * (expanding ? 1 : -1)
this.selectToggleFunction(this.rectangles[index], expanding)
this.computeBoundaries(finalPosition)
this.selectTo(finalPosition)
}

9
js/UEBlueprint.js
View File

@@ -314,7 +314,7 @@ export default class UEBlueprint extends HTMLElement {
}
getScale() {
return parseFloat(getComputedStyle(this.gridElement).getPropertyValue('--ueb-grid-scale'))
return parseFloat(getComputedStyle(this.gridElement).getPropertyValue('--ueb-scale'))
}
compensateTranslation(position) {
@@ -360,7 +360,12 @@ export default class UEBlueprint extends HTMLElement {
* @param {...UEBlueprintObject} blueprintNodes
*/
addNode(...blueprintNodes) {
[...blueprintNodes].reduce((s, e) => s.push(e), this.nodes)
[...blueprintNodes].reduce(
(s, e) => {
s.push(e)
return s
},
this.nodes)
if (this.nodesContainerElement) {
this.nodesContainerElement.append(...blueprintNodes)
}