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

Fix input details

Browse Source
This commit is contained in:
barsdeveloper
2022-05-08 20:21:37 +02:00
parent 59eaa57217
commit 3c643f0c6a
7 changed files with 214 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
dist/ueblueprint.js vendored
View File

@@ -214,6 +214,75 @@ class IInput {
// @ts-check
/**
* @template T
*/
class TypeInitialization {
/** @type {Constructor|Array<Constructor>} */
#type
get type() {
return this.#type
}
set type(v) {
this.#type = v;
}
#showDefault = true
get showDefault() {
return this.#showDefault
}
set showDefault(v) {
this.#showDefault = v;
}
/** @type {T} */
#value
get value() {
return this.#value
}
set value(v) {
this.#value = v;
}
static sanitize(value, targetType) {
if (targetType === undefined) {
targetType = value?.constructor;
}
let wrongType = false;
if (targetType && value?.constructor !== targetType && !(value instanceof targetType)) {
wrongType = true;
}
if (value instanceof Boolean || value instanceof Number || value instanceof String) {
value = value.valueOf(); // Get the relative primitive value
}
if (wrongType) {
return new targetType(value)
}
return value
}
/**
* @typedef {(new () => T) | StringConstructor | NumberConstructor | BooleanConstructor} Constructor
* @param {Constructor|Array<Constructor>} type
* @param {Boolean} showDefault
* @param {any} value
*/
constructor(type, showDefault = true, value = undefined) {
if (value === undefined) {
if (type instanceof Array) {
value = [];
} else {
value = TypeInitialization.sanitize(new type());
}
}
this.#showDefault = showDefault;
this.#type = type;
}
}
// @ts-check
class Utility {
static sigmoid(x, curvature = 1.7) {
@@ -378,7 +447,6 @@ class Utility {
return value
.replace(/\n$/, "") // Remove trailing newline
.replaceAll("\u00A0", " ") // Replace special space symbol
.replaceAll("\r\n", String.raw`\r\n`) // Replace newline with \r\n
.replaceAll("\n", String.raw`\r\n`) // Replace newline with \r\n
}
@@ -387,8 +455,7 @@ class Utility {
*/
static decodeInputString(value) {
return value
.replaceAll(" ", "\u00A0") // Replace special space symbol
.replaceAll(String.raw`\r\n`, "<br />\n") // Replace newline with \r\n
.replaceAll("\\r\n", "\n") // Replace newline with \r\n
}
/**
@@ -422,84 +489,6 @@ class Utility {
// @ts-check
/**
* @template T
*/
class TypeInitialization {
/** @type {Constructor|Array<Constructor>} */
#type
get type() {
return this.#type
}
set type(v) {
this.#type = v;
}
#showDefault = true
get showDefault() {
return this.#showDefault
}
set showDefault(v) {
this.#showDefault = v;
}
/** @type {T} */
#value
get value() {
return this.#value
}
set value(v) {
this.#value = v;
}
#decodeString
get decodeString() {
return this.#decodeString
}
set decodeString(v) {
this.#decodeString = v;
}
static sanitize(value, targetType) {
if (targetType === undefined) {
targetType = value?.constructor;
}
let wrongType = false;
if (targetType && value?.constructor !== targetType && !(value instanceof targetType)) {
wrongType = true;
}
if (value instanceof Boolean || value instanceof Number || value instanceof String) {
value = value.valueOf(); // Get the relative primitive value
}
if (wrongType) {
return new targetType(value)
}
return value
}
/**
* @typedef {(new () => T) | StringConstructor | NumberConstructor | BooleanConstructor} Constructor
* @param {Constructor|Array<Constructor>} type
* @param {Boolean} showDefault
* @param {any} value
*/
constructor(type, showDefault = true, value = undefined) {
if (value === undefined) {
if (type instanceof Array) {
value = [];
} else {
value = TypeInitialization.sanitize(new type());
}
}
this.#value = type === String ? Utility.decodeString(value) : value;
this.#showDefault = showDefault;
this.#type = type;
}
}
// @ts-check
class IEntity {
static attributes = {}
@@ -2960,6 +2949,9 @@ class IInputPinTemplate extends PinTemplate {
/** @type {HTMLElement[]} */
#inputContentElements
get inputContentElements() {
return this.#inputContentElements
}
hasInput = true
/**
@@ -2971,7 +2963,7 @@ class IInputPinTemplate extends PinTemplate {
[...pin.querySelectorAll(".ueb-pin-input-content")]
);
if (this.#inputContentElements.length) {
this.setInputs(pin, [pin.entity.DefaultValue]);
this.setInputs(pin, [Utility.decodeInputString(pin.entity.DefaultValue)]);
let self = this;
this.onFocusHandler = _ => pin.blueprint.dispatchEditTextEvent(true);
this.onFocusOutHandler = e => {
@@ -3019,16 +3011,18 @@ class IInputPinTemplate extends PinTemplate {
* @param {PinElement} pin
*/
getInputs(pin) {
return this.#inputContentElements.map(element => Utility.encodeInputString(element.textContent))
return this.#inputContentElements.map(element => element.innerText)
}
/**
* @param {PinElement} pin
* @param {String[]?} values
*/
setInputs(pin, values = []) {
this.#inputContentElements.forEach((element, i) => element.innerText = Utility.decodeInputString(values[i]));
pin.entity.DefaultValue = this.getInput(pin);
setInputs(pin, values = [], updateDefaultValue = true) {
this.#inputContentElements.forEach((element, i) => element.innerText = values[i]);
if (updateDefaultValue) {
pin.entity.DefaultValue = this.getInput(pin);
}
}
/**
@@ -3151,11 +3145,18 @@ class RealPinTemplate extends IInputPinTemplate {
*/
setInputs(pin, values = []) {
let num = parseFloat(values.length ? values[0] : this.getInput(pin));
let updateDefaultValue = true;
if (isNaN(num)) {
num = parseFloat(pin.entity.DefaultValue != "" ? pin.entity.DefaultValue : pin.entity.AutogeneratedDefaultValue);
num = parseFloat(pin.entity.DefaultValue != ""
? pin.entity.DefaultValue
: pin.entity.AutogeneratedDefaultValue);
}
if (isNaN(num)) {
num = 0;
updateDefaultValue = false;
}
values[0] = Utility.minDecimals(num);
super.setInputs(pin, values);
super.setInputs(pin, values, updateDefaultValue);
}
}
@@ -3177,6 +3178,58 @@ class StringPinTemplate extends IInputPinTemplate {
// @ts-check
/**
* @typedef {import("../element/PinElement").default} PinElement
*/
class NamePinTemplate extends IInputPinTemplate {
/** @type {(e : InputEvent) => void} */
onInputHandler
/**
* @param {PinElement} pin
*/
setup(pin) {
super.setup(pin);
this.onInputHandler = e => {
e.stopPropagation();
if (
e.inputType == "insertParagraph"
|| e.inputType == "insertLineBreak"
|| (e.inputType == "insertFromPaste" && /** @type {HTMLElement} */(e.target).innerText.includes("\n"))
) {
/** @type {HTMLElement} */(e.target).blur(); // Loose focus in case it tries to insert newline
this.inputContentElements.forEach(element => element.innerText = element.innerText.replaceAll("\n", ""));
}
};
this.inputContentElements.forEach(element => {
element.addEventListener("input", /** @type {(e : Event) => void} */(this.onInputHandler));
});
}
/**
* @param {PinElement} pin
*/
cleanup(pin) {
super.cleanup(pin);
this.inputContentElements.forEach(element => {
element.removeEventListener("input", /** @type {(e : Event) => void} */(this.onInputHandler));
});
}
/**
* @param {PinElement} pin
* @param {String[]?} values
*/
setInputs(pin, values = [], updateDefaultValue = true) {
values = values.map(value => value.replaceAll("\n", ""));
super.setInputs(pin, values, updateDefaultValue);
}
}
// @ts-check
/**
* @typedef {import("../entity/GuidEntity").default} GuidEntity
* @typedef {import("../entity/PinEntity").default} PinEntity
@@ -3192,6 +3245,7 @@ class PinElement extends IElement {
static #typeTemplateMap = {
"bool": BoolPinTemplate,
"exec": ExecPinTemplate,
"name": NamePinTemplate,
"real": RealPinTemplate,
"string": StringPinTemplate,
}

4
js/Utility.js
View File

@@ -166,7 +166,6 @@ export default class Utility {
return value
.replace(/\n$/, "") // Remove trailing newline
.replaceAll("\u00A0", " ") // Replace special space symbol
.replaceAll("\r\n", String.raw`\r\n`) // Replace newline with \r\n
.replaceAll("\n", String.raw`\r\n`) // Replace newline with \r\n
}
@@ -175,8 +174,7 @@ export default class Utility {
*/
static decodeInputString(value) {
return value
.replaceAll(" ", "\u00A0") // Replace special space symbol
.replaceAll(String.raw`\r\n`, "<br />\n") // Replace newline with \r\n
.replaceAll("\\r\n", "\n") // Replace newline with \r\n
}
/**

2
js/element/PinElement.js
View File

@@ -8,6 +8,7 @@ import PinTemplate from "../template/PinTemplate"
import RealPinTemplate from "../template/RealPinTemplate"
import StringPinTemplate from "../template/StringPinTemplate"
import Utility from "../Utility"
import NamePinTemplate from "../template/NamePinTemplate"
/**
* @typedef {import("../entity/GuidEntity").default} GuidEntity
@@ -24,6 +25,7 @@ export default class PinElement extends IElement {
static #typeTemplateMap = {
"bool": BoolPinTemplate,
"exec": ExecPinTemplate,
"name": NamePinTemplate,
"real": RealPinTemplate,
"string": StringPinTemplate,
}

11
js/entity/TypeInitialization.js
View File

@@ -1,7 +1,5 @@
// @ts-check
import Utility from "../Utility"
/**
* @template T
*/
@@ -33,14 +31,6 @@ export default class TypeInitialization {
this.#value = v
}
#decodeString
get decodeString() {
return this.#decodeString
}
set decodeString(v) {
this.#decodeString = v
}
static sanitize(value, targetType) {
if (targetType === undefined) {
targetType = value?.constructor
@@ -72,7 +62,6 @@ export default class TypeInitialization {
value = TypeInitialization.sanitize(new type())
}
}
this.#value = type === String ? Utility.decodeString(value) : value
this.#showDefault = showDefault
this.#type = type
}

15
js/template/IInputPinTemplate.js
View File

@@ -13,6 +13,9 @@ export default class IInputPinTemplate extends PinTemplate {
/** @type {HTMLElement[]} */
#inputContentElements
get inputContentElements() {
return this.#inputContentElements
}
hasInput = true
/**
@@ -24,7 +27,7 @@ export default class IInputPinTemplate extends PinTemplate {
[...pin.querySelectorAll(".ueb-pin-input-content")]
)
if (this.#inputContentElements.length) {
this.setInputs(pin, [pin.entity.DefaultValue])
this.setInputs(pin, [Utility.decodeInputString(pin.entity.DefaultValue)])
let self = this
this.onFocusHandler = _ => pin.blueprint.dispatchEditTextEvent(true)
this.onFocusOutHandler = e => {
@@ -72,16 +75,18 @@ export default class IInputPinTemplate extends PinTemplate {
* @param {PinElement} pin
*/
getInputs(pin) {
return this.#inputContentElements.map(element => Utility.encodeInputString(element.textContent))
return this.#inputContentElements.map(element => element.innerText)
}
/**
* @param {PinElement} pin
* @param {String[]?} values
*/
setInputs(pin, values = []) {
this.#inputContentElements.forEach((element, i) => element.innerText = Utility.decodeInputString(values[i]))
pin.entity.DefaultValue = this.getInput(pin)
setInputs(pin, values = [], updateDefaultValue = true) {
this.#inputContentElements.forEach((element, i) => element.innerText = values[i])
if (updateDefaultValue) {
pin.entity.DefaultValue = this.getInput(pin)
}
}
/**

53
js/template/NamePinTemplate.js Normal file
View File

@@ -0,0 +1,53 @@
// @ts-check
import IInputPinTemplate from "./IInputPinTemplate"
/**
* @typedef {import("../element/PinElement").default} PinElement
*/
export default class NamePinTemplate extends IInputPinTemplate {
/** @type {(e : InputEvent) => void} */
onInputHandler
/**
* @param {PinElement} pin
*/
setup(pin) {
super.setup(pin)
this.onInputHandler = e => {
e.stopPropagation()
if (
e.inputType == "insertParagraph"
|| e.inputType == "insertLineBreak"
|| (e.inputType == "insertFromPaste" && /** @type {HTMLElement} */(e.target).innerText.includes("\n"))
) {
/** @type {HTMLElement} */(e.target).blur() // Loose focus in case it tries to insert newline
this.inputContentElements.forEach(element => element.innerText = element.innerText.replaceAll("\n", ""))
}
}
this.inputContentElements.forEach(element => {
element.addEventListener("input", /** @type {(e : Event) => void} */(this.onInputHandler))
})
}
/**
* @param {PinElement} pin
*/
cleanup(pin) {
super.cleanup(pin)
this.inputContentElements.forEach(element => {
element.removeEventListener("input", /** @type {(e : Event) => void} */(this.onInputHandler))
})
}
/**
* @param {PinElement} pin
* @param {String[]?} values
*/
setInputs(pin, values = [], updateDefaultValue = true) {
values = values.map(value => value.replaceAll("\n", ""))
super.setInputs(pin, values, updateDefaultValue)
}
}

7
js/template/RealPinTemplate.js
View File

@@ -15,12 +15,17 @@ export default class RealPinTemplate extends IInputPinTemplate {
*/
setInputs(pin, values = []) {
let num = parseFloat(values.length ? values[0] : this.getInput(pin))
let updateDefaultValue = true
if (isNaN(num)) {
num = parseFloat(pin.entity.DefaultValue != ""
? pin.entity.DefaultValue
: pin.entity.AutogeneratedDefaultValue)
}
if (isNaN(num)) {
num = 0
updateDefaultValue = false
}
values[0] = Utility.minDecimals(num)
super.setInputs(pin, values)
super.setInputs(pin, values, updateDefaultValue)
}
}