@flashist/appframework 0.0.63 → 0.0.65

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,14 @@
1
+ import { IFLabelConfig } from "@flashist/flibs";
2
+ export declare const SimpleButtonDefaultConfig: {
3
+ labelConfig: IFLabelConfig;
4
+ states: {
5
+ normal: ISingleButtonStateConfig;
6
+ over: ISingleButtonStateConfig;
7
+ press: ISingleButtonStateConfig;
8
+ disabled: ISingleButtonStateConfig;
9
+ };
10
+ };
11
+ export interface ISingleButtonStateConfig {
12
+ alpha: number;
13
+ }
14
+ export declare type SimpleButtonConfig = typeof SimpleButtonDefaultConfig;
@@ -0,0 +1,35 @@
1
+ export var SimpleButtonDefaultConfig = {
2
+ labelConfig: {},
3
+ states: {
4
+ normal: {
5
+ alpha: 0.75
6
+ },
7
+ over: {
8
+ alpha: 1
9
+ },
10
+ press: {
11
+ alpha: 1
12
+ },
13
+ disabled: {
14
+ alpha: 0.5
15
+ }
16
+ }
17
+ };
18
+ // export interface ISimpleButtonConfig {
19
+ // // bgConfig?: {
20
+ // // image?: {
21
+ // // imageId: string;
22
+ // // };
23
+ // // vector?: {
24
+ // // bgColor: number;
25
+ // // overBgColor: number;
26
+ // // bgAlpha: number;
27
+ // // bgBorderColor: number;
28
+ // // bgBorderAlpha: number;
29
+ // // bgBorderWidth: number;
30
+ // // }
31
+ // // resizeBg?: boolean;
32
+ // // };
33
+ // labelConfig?: IFLabelConfig;
34
+ // }
35
+ //# sourceMappingURL=SimpleButtonConfig.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,yBAAyB,GAAG;IACrC,WAAW,EAAE,EAAmB;IAChC,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI;SACc;QAC7B,IAAI,EAAE;YACF,KAAK,EAAE,CAAC;SACiB;QAC7B,KAAK,EAAE;YACH,KAAK,EAAE,CAAC;SACiB;QAC7B,QAAQ,EAAE;YACN,KAAK,EAAE,GAAG;SACe;KAChC;CACJ,CAAA;AAQD,yCAAyC;AACzC,sBAAsB;AACtB,uBAAuB;AACvB,kCAAkC;AAClC,gBAAgB;AAEhB,wBAAwB;AACxB,kCAAkC;AAClC,sCAAsC;AACtC,kCAAkC;AAClC,wCAAwC;AACxC,wCAAwC;AACxC,wCAAwC;AACxC,eAAe;AAEf,iCAAiC;AACjC,YAAY;AAEZ,mCAAmC;AACnC,IAAI"}
@@ -1,5 +1,5 @@
1
1
  import { FContainer, FLabel } from "@flashist/flibs";
2
- import { ISimpleButtonConfig } from "./ISimpleButtonConfig";
2
+ import { SimpleButtonConfig } from "./SimpleButtonConfig";
3
3
  import { ResizableContainer } from "../resize/ResizableContainer";
4
4
  import { IToggableItem } from "../togglegroup/IToggableItem";
5
5
  export declare class SimpleButtonView<DataType extends object = object> extends ResizableContainer<DataType> implements IToggableItem {
@@ -7,11 +7,11 @@ export declare class SimpleButtonView<DataType extends object = object> extends
7
7
  private _enabled;
8
8
  protected _state: string;
9
9
  protected _selected: boolean;
10
- protected config: ISimpleButtonConfig;
10
+ protected config: SimpleButtonConfig;
11
11
  protected contentCont: FContainer;
12
12
  protected label: FLabel;
13
- constructor(config: ISimpleButtonConfig);
14
- protected construction(config: ISimpleButtonConfig): void;
13
+ constructor(config: SimpleButtonConfig);
14
+ protected construction(config: SimpleButtonConfig): void;
15
15
  protected addListeners(): void;
16
16
  private onOver;
17
17
  private onOut;
@@ -14,8 +14,10 @@ var __extends = (this && this.__extends) || (function () {
14
14
  };
15
15
  })();
16
16
  import { FContainer, FLabel, InteractiveEvent } from "@flashist/flibs";
17
+ import { SimpleButtonDefaultConfig } from "./SimpleButtonConfig";
17
18
  import { SimpleButtonState } from "./SimpleButtonState";
18
19
  import { ResizableContainer } from "../resize/ResizableContainer";
20
+ import { ObjectTools } from '@flashist/fcore';
19
21
  var SimpleButtonView = /** @class */ (function (_super) {
20
22
  __extends(SimpleButtonView, _super);
21
23
  function SimpleButtonView(config) {
@@ -23,7 +25,10 @@ var SimpleButtonView = /** @class */ (function (_super) {
23
25
  }
24
26
  SimpleButtonView.prototype.construction = function (config) {
25
27
  _super.prototype.construction.call(this);
26
- this.config = config;
28
+ // First "write" default values
29
+ this.config = ObjectTools.clone(SimpleButtonDefaultConfig);
30
+ // Then override them with passed config
31
+ ObjectTools.copyProps(this.config, config);
27
32
  this.contentCont = new FContainer();
28
33
  this.addChild(this.contentCont);
29
34
  // this.bg = this.createBg();
@@ -114,13 +119,22 @@ var SimpleButtonView = /** @class */ (function (_super) {
114
119
  });
115
120
  SimpleButtonView.prototype.commitData = function () {
116
121
  _super.prototype.commitData.call(this);
122
+ var tempConfigState = this.state;
123
+ if (!this.config.states[tempConfigState]) {
124
+ if (this.selected) {
125
+ tempConfigState = SimpleButtonState.SELECTED_TO_NORMAL_MAP[this.state];
126
+ }
127
+ }
128
+ if (!this.config.states[tempConfigState]) {
129
+ tempConfigState = SimpleButtonState.NORMAL;
130
+ }
131
+ var tempConfig = this.config.states[tempConfigState];
132
+ this.alpha = tempConfig.alpha;
117
133
  if (this.enabled) {
118
134
  this.interactive = true;
119
- this.alpha = 1;
120
135
  }
121
136
  else {
122
137
  this.interactive = false;
123
- this.alpha = 0.5;
124
138
  }
125
139
  // this.updateBg();
126
140
  };
@@ -1 +1 @@
1
- {"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flashist/appframework",
3
- "version": "0.0.63",
3
+ "version": "0.0.65",
4
4
  "scripts": {
5
5
  "build": "gulp",
6
6
  "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",
@@ -1,4 +0,0 @@
1
- import { IFLabelConfig } from "@flashist/flibs";
2
- export interface ISimpleButtonConfig {
3
- labelConfig?: IFLabelConfig;
4
- }
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=ISimpleButtonConfig.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ISimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/ISimpleButtonConfig.ts"],"names":[],"mappings":""}