uicore-ts 1.1.5 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uicore-ts",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "UICore is a library to build native-like user interfaces using pure Typescript. No HTML is needed at all. Components are described as TS classes and all user interactions are handled explicitly. This library is strongly inspired by the UIKit framework that is used in IOS. In addition, UICore has tools to handle URL based routing, array sorting and filtering and adds a number of other utilities for convenience.",
   "main": "compiledScripts/index.js",
   "types": "compiledScripts/index.d.ts",

package/scripts/UIDateTimeInput.ts

@@ -24,7 +24,6 @@ export class UIDateTimeInput extends UIView {
     })
     
     
-    // @ts-ignore
     override get controlEventTargetAccumulator(): UIViewAddControlEventTargetObject<UIDateTimeInput> {
         return super.controlEventTargetAccumulator as any
     }

package/scripts/UIKeyValueStringFilterWebWorker.worker.ts

@@ -3,7 +3,7 @@
 if ("contains" in Array.prototype == false) {
     
     // @ts-ignore
-    Array.prototype.contains = function (this: Array, element) {
+    Array.prototype.contains = function (element) {
         
         var result = (this.indexOf(element) != -1)
         return result
@@ -15,7 +15,7 @@ if ("contains" in Array.prototype == false) {
 if ("contains" in String.prototype == false) {
     
     // @ts-ignore
-    String.prototype.contains = function (this: string, string) {
+    String.prototype.contains = function (string) {
         
         var result = (this.indexOf(string) != -1)
         return result

package/scripts/UILinkButton.ts

@@ -15,9 +15,7 @@ export class UILinkButton extends UILink {
         this.addSubview(this.button)
     
         this.style.position = "absolute"
-        this.button.controlEventTargetAccumulator.EnterDown.PointerUpInside(
-            () => window.location = this.target as any
-        )
+        this.button.controlEventTargetAccumulator.EnterDown.PointerUpInside = () => window.location = this.target as any
     
     }
     

package/scripts/UITextField.ts

@@ -46,11 +46,10 @@ export class UITextField extends UITextView {
         
     })
     
-    // @ts-ignore
-    public override get controlEventTargetAccumulator(): UIViewAddControlEventTargetObject<UITextField> {
-        return super.controlEventTargetAccumulator as any
-    }
     
+    override get controlEventTargetAccumulator(): UIViewAddControlEventTargetObject<typeof UITextField> {
+        return (super.controlEventTargetAccumulator as any)
+    }
     
     public override get viewHTMLElement() {
         return this._viewHTMLElement

package/scripts/UIView.ts

@@ -5,21 +5,7 @@ import { UICore } from "./UICore"
 import "./UICoreExtensions"
 import type { UIDialogView } from "./UIDialogView"
 import { UILocalizedTextObject } from "./UIInterfaces"
-import {
-    FIRST,
-    FIRST_OR_NIL,
-    IF,
-    IS,
-    IS_DEFINED,
-    IS_NIL,
-    IS_NOT,
-    nil,
-    NO,
-    RETURNER,
-    UIFunctionCall,
-    UIObject,
-    YES
-} from "./UIObject"
+import { FIRST, FIRST_OR_NIL, IF, IS, IS_DEFINED, IS_NIL, IS_NOT, nil, NO, RETURNER, UIObject, YES } from "./UIObject"
 import { UIPoint } from "./UIPoint"
 import { UIRectangle } from "./UIRectangle"
 import { UIViewController } from "./UIViewController"
@@ -125,20 +111,14 @@ type Mutable<T> = {
     -readonly [P in keyof T]: T[P]
 };
 
-// export type UIViewAddControlEventTargetObject<T extends { controlEvent: Record<string, any> }> = Mutable<{
-//
-//     [K in keyof T["controlEvent"]]: ((
-//     sender: UIView,
-//     event: Event
-// ) => void) & Partial<UIViewAddControlEventTargetObject<T>>
-//
-// }>
-
 export type UIViewAddControlEventTargetObject<T extends { controlEvent: Record<string, any> }> = Mutable<{
-    [K in keyof T["controlEvent"]]: UIViewAddControlEventTargetObject<T> & (
-        (handler: (sender: T, event: Event) => void) => void
-    ) & UIFunctionCall<(handler: (sender: T, event: Event) => void) => void>
-}>;
+    
+    [K in keyof T["controlEvent"]]: ((
+    sender: UIView,
+    event: Event
+) => void) & Partial<UIViewAddControlEventTargetObject<T>>
+    
+}>
 
 
 interface Constraint {
@@ -2187,8 +2167,8 @@ export class UIView extends UIObject {
             
         }
         
-        this.controlEventTargetAccumulator.PointerDrag(movementFunction)
-        this.controlEventTargetAccumulator.PointerUp.PointerCancel(movementStopFunction)
+        this.controlEventTargetAccumulator.PointerDrag = movementFunction
+        this.controlEventTargetAccumulator.PointerUp.PointerCancel = movementStopFunction
         
         //UIObject.configureWithObject(overlayElement, { remove: EXTEND(() => cleanupFunction()) })
         
@@ -2403,8 +2383,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        leftEdge.controlEventTargetAccumulator.PointerDrag(PointerXDragFunction.bind(this, 1))
-        leftEdge.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        leftEdge.controlEventTargetAccumulator.PointerDrag = PointerXDragFunction.bind(this, 1)
+        leftEdge.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         const rightEdge = new UIView().configuredWithObject({
             _viewHTMLElement: {
@@ -2424,8 +2404,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        rightEdge.controlEventTargetAccumulator.PointerDrag(PointerXDragFunction.bind(this, 0))
-        rightEdge.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        rightEdge.controlEventTargetAccumulator.PointerDrag = PointerXDragFunction.bind(this, 0)
+        rightEdge.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         // noinspection JSSuspiciousNameCombination
         const bottomEdge = new UIView().configuredWithObject({
@@ -2446,8 +2426,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        bottomEdge.controlEventTargetAccumulator.PointerDrag(PointerYDragFunction.bind(this, 0))
-        bottomEdge.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        bottomEdge.controlEventTargetAccumulator.PointerDrag = PointerYDragFunction.bind(this, 0)
+        bottomEdge.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         // noinspection JSSuspiciousNameCombination
         const topEdge = new UIView().configuredWithObject({
@@ -2468,8 +2448,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        topEdge.controlEventTargetAccumulator.PointerDrag(PointerYDragFunction.bind(this, 1))
-        topEdge.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        topEdge.controlEventTargetAccumulator.PointerDrag = PointerYDragFunction.bind(this, 1)
+        topEdge.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         
         const pointerDragTLFunction = (sender: UIView, event: Event) => {
@@ -2497,8 +2477,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        topLeftCornerTop.controlEventTargetAccumulator.PointerDrag(pointerDragTLFunction)
-        topLeftCornerTop.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        topLeftCornerTop.controlEventTargetAccumulator.PointerDrag = pointerDragTLFunction
+        topLeftCornerTop.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         const topLeftCornerLeft = new UIView().configuredWithObject({
             _viewHTMLElement: {
@@ -2519,8 +2499,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        topLeftCornerLeft.controlEventTargetAccumulator.PointerDrag(pointerDragTLFunction)
-        topLeftCornerLeft.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        topLeftCornerLeft.controlEventTargetAccumulator.PointerDrag = pointerDragTLFunction
+        topLeftCornerLeft.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         
         const pointerDragBLFunction = (sender: UIView, event: Event) => {
@@ -2547,8 +2527,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        bottomLeftCornerLeft.controlEventTargetAccumulator.PointerDrag(pointerDragBLFunction)
-        bottomLeftCornerLeft.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        bottomLeftCornerLeft.controlEventTargetAccumulator.PointerDrag = pointerDragBLFunction
+        bottomLeftCornerLeft.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         // noinspection JSSuspiciousNameCombination
         const bottomLeftCornerBottom = new UIView().configuredWithObject({
@@ -2570,8 +2550,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        bottomLeftCornerBottom.controlEventTargetAccumulator.PointerDrag(pointerDragBLFunction)
-        bottomLeftCornerBottom.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        bottomLeftCornerBottom.controlEventTargetAccumulator.PointerDrag = pointerDragBLFunction
+        bottomLeftCornerBottom.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         
         const pointerDragBRFunction = (sender: UIView, event: Event) => {
@@ -2599,8 +2579,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        bottomRightCornerBottom.controlEventTargetAccumulator.PointerDrag(pointerDragBRFunction)
-        bottomRightCornerBottom.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        bottomRightCornerBottom.controlEventTargetAccumulator.PointerDrag = pointerDragBRFunction
+        bottomRightCornerBottom.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         const bottomRightCornerRight = new UIView().configuredWithObject({
             _viewHTMLElement: {
@@ -2621,8 +2601,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        bottomRightCornerRight.controlEventTargetAccumulator.PointerDrag(pointerDragBRFunction)
-        bottomRightCornerRight.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        bottomRightCornerRight.controlEventTargetAccumulator.PointerDrag = pointerDragBRFunction
+        bottomRightCornerRight.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         
         const pointerDragTRFunction = (sender: UIView, event: Event) => {
@@ -2649,8 +2629,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        topRightCornerRight.controlEventTargetAccumulator.PointerDrag(pointerDragTRFunction)
-        topRightCornerRight.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        topRightCornerRight.controlEventTargetAccumulator.PointerDrag = pointerDragTRFunction
+        topRightCornerRight.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         // noinspection JSSuspiciousNameCombination
         const topRightCornerTop = new UIView().configuredWithObject({
@@ -2672,8 +2652,8 @@ export class UIView extends UIObject {
             shouldCallPointerHover: async () => YES,
             pausesPointerEvents: YES
         })
-        topRightCornerTop.controlEventTargetAccumulator.PointerDrag(pointerDragTRFunction)
-        topRightCornerTop.controlEventTargetAccumulator.PointerUp(pointerUpFunction)
+        topRightCornerTop.controlEventTargetAccumulator.PointerDrag = pointerDragTRFunction
+        topRightCornerTop.controlEventTargetAccumulator.PointerUp = pointerUpFunction
         
         
         const views = [
@@ -3217,19 +3197,6 @@ export class UIView extends UIObject {
                     
                     return result
                     
-                },
-                apply: (_target, _thisArg, args) => {
-                    
-                    const handler = args[0];
-                    if (typeof handler === 'function') {
-                        this.addTargetForControlEvents(eventKeys, handler);
-                    }
-                    else {
-                        throw "Handler must be a function, not " + handler
-                    }
-                    
-                    return true
-                    
                 },
                 set: (target, key: string, value, _receiver) => {