@nativescript-community/ui-material-bottomsheet 7.2.5 → 7.2.7

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.
@@ -47,14 +47,15 @@ export class ViewWithBottomSheetBase extends View {
47
47
  }
48
48
  this._raiseClosedBottomSheetEvent();
49
49
  this._onDismissBottomSheetCallback = null;
50
- this._closeBottomSheetCallback = null;
51
50
  this._bottomSheetClosed();
52
51
  if (this._bottomSheetContext.closeCallback) {
52
+ this._bottomSheetContext.closeCallback();
53
53
  // only called if not already called by _closeBottomSheetCallback
54
- if (typeof options.closeCallback === 'function') {
55
- options.closeCallback.apply(undefined, originalArgs);
56
- }
54
+ // if (typeof options.closeCallback === 'function') {
55
+ // options.closeCallback.apply(undefined, originalArgs);
56
+ // }
57
57
  }
58
+ this._closeBottomSheetCallback = null;
58
59
  this._bottomSheetContext = null;
59
60
  };
60
61
  this._closeBottomSheetCallback = (...originalArgs) => {
@@ -100,7 +101,7 @@ export class ViewWithBottomSheetBase extends View {
100
101
  closeBottomSheet(...args) {
101
102
  const closeCallback = this._closeBottomSheetCallback;
102
103
  if (closeCallback) {
103
- closeCallback.apply(undefined, arguments);
104
+ closeCallback.apply(undefined, args);
104
105
  }
105
106
  else {
106
107
  const parent = this.parent;
@@ -1 +1 @@
1
- {"version":3,"file":"bottomsheet-common.js","sourceRoot":"../src/","sources":["bottomsheet-common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bottomsheet-common.js","sourceRoot":"../src/","sources":["bottomsheet-common.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nativescript-community/ui-material-bottomsheet",
3
- "version": "7.2.5",
3
+ "version": "7.2.7",
4
4
  "description": "Material Design Bottom Sheets slide up from the bottom of the screen to reveal more content. Bottom sheets integrate with the app to display supporting content or present deep-linked content from other apps.",
5
5
  "main": "./bottomsheet",
6
6
  "sideEffects": false,
@@ -46,7 +46,7 @@
46
46
  },
47
47
  "readmeFilename": "README.md",
48
48
  "dependencies": {
49
- "@nativescript-community/ui-material-core": "^7.2.5"
49
+ "@nativescript-community/ui-material-core": "^7.2.7"
50
50
  },
51
- "gitHead": "f902ec0ab6b3605985d237a14fbc0af346a2f19d"
51
+ "gitHead": "cde6c9a34fb1ce8b2e4ee5cb95a529bf0c3d4ceb"
52
52
  }
package/svelte/index.js CHANGED
@@ -18,8 +18,11 @@ export function showBottomSheet(modalOptions) {
18
18
  const closeCallback = (result) => {
19
19
  if (resolved)
20
20
  return;
21
- modalStack.pop();
22
21
  resolved = true;
22
+ if (options.closeCallback) {
23
+ options.closeCallback(result, componentInstanceInfo.viewInstance);
24
+ }
25
+ modalStack.pop();
23
26
  resolve(result);
24
27
  modalView._tearDownUI();
25
28
  componentInstanceInfo.viewInstance.$destroy(); // don't let an exception in destroy kill the promise callback
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["svelte/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAoBzE,MAAM,UAAU,GAA4B,EAAE,CAAC;AAE/C,MAAM,UAAU,uBAAuB,CAAI,QAAmC,EAAE,KAAW;IACvF,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,QAAe,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAiC,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAmB,YAA6C;IAC3F,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9D,0EAA0E;IAC1E,MAAM,aAAa,GAAS,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAE7H,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnE,IAAI,SAAS,GAAS,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;IAE/D,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,aAAa,GAAG,CAAC,MAAS,EAAE,EAAE;YAChC,IAAI,QAAQ;gBAAE,OAAO;YACrB,UAAU,CAAC,GAAG,EAAE,CAAC;YACjB,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,SAAS,CAAC,WAAW,EAAE,CAAC;YACxB,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,8DAA8D;QACjH,CAAC,CAAC;QACF,IAAI;YACA,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YAC3F,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,CAAC;SACf;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAY;IACzC,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,qBAAqB,EAAE;QACtB,qBAAqB,CAAC,OAAO,CAAC,UAAkB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;KAC9E;AACL,CAAC;AACD,MAAM,UAAU,mBAAmB;IAC/B,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AACjC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["svelte/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAoBzE,MAAM,UAAU,GAA4B,EAAE,CAAC;AAE/C,MAAM,UAAU,uBAAuB,CAAI,QAAmC,EAAE,KAAW;IACvF,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,QAAe,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAiC,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAmB,YAA6C;IAC3F,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9D,0EAA0E;IAC1E,MAAM,aAAa,GAAS,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAE7H,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnE,IAAI,SAAS,GAAS,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;IAE/D,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,aAAa,GAAG,CAAC,MAAS,EAAE,EAAE;YAChC,IAAI,QAAQ;gBAAE,OAAO;YACrB,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,OAAO,CAAC,aAAa,EAAE;gBACvB,OAAO,CAAC,aAAa,CAAC,MAAM,EAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;aACpE;YACD,UAAU,CAAC,GAAG,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,SAAS,CAAC,WAAW,EAAE,CAAC;YACxB,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,8DAA8D;QACjH,CAAC,CAAC;QACF,IAAI;YACA,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YAC3F,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,CAAC;SACf;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAY;IACzC,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,qBAAqB,EAAE;QACtB,qBAAqB,CAAC,OAAO,CAAC,UAAkB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;KAC9E;AACL,CAAC;AACD,MAAM,UAAU,mBAAmB;IAC/B,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AACjC,CAAC"}
package/vue/index.js CHANGED
@@ -30,14 +30,16 @@ const BottomSheetPlugin = {
30
30
  navEntryInstance.$mount();
31
31
  this.nativeView.showBottomSheet(Object.assign({}, options, {
32
32
  view: navEntryInstance.nativeView,
33
- closeCallback: (...args) => {
33
+ closeCallback: (result) => {
34
34
  if (resolved) {
35
35
  return;
36
36
  }
37
37
  resolved = true;
38
+ if (options.closeCallback) {
39
+ options.closeCallback(result, navEntryInstance);
40
+ }
41
+ resolve(result);
38
42
  if (navEntryInstance && navEntryInstance.nativeView) {
39
- options.closeCallback && options.closeCallback.apply(undefined, args);
40
- resolve(...args);
41
43
  navEntryInstance.$emit('bottomsheet:close');
42
44
  navEntryInstance.$destroy();
43
45
  navEntryInstance = null;
package/vue/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["vue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAc1C,IAAI,iBAAiB,GAAG,CAAC,CAAC;AAE1B,SAAS,qBAAqB,CAAC,OAAO;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACvC,OAAO,IAAI,CAAC;KACf;IAED,MAAM,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/B,OAAO,CACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACtC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;SACvC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;SACrC,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CACnC,CAAC;AACN,CAAC;AAED,MAAM,iBAAiB,GAAG;IACtB,OAAO,CAAC,GAAG;QACP,GAAG,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,SAAS,EAAE,OAA8B;YAChF,OAAO,IAAI,OAAO,CAAC,CAAC,OAA0B,EAAE,EAAE;gBAC9C,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,gBAAgB,GAAG,IAAI,GAAG,CAAC;oBAC3B,IAAI,EAAE,kBAAkB;oBACxB,MAAM,EAAE,IAAI,CAAC,KAAK;oBAClB,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CACV,CAAC,CAAC,SAAS,EAAE;wBACT,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,EAAE,EAAE,OAAO,CAAC,EAAE;wBACd,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC;qBACtC,CAAC;iBACT,CAAC,CAAC;gBACH,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,UAAU,CAAC,eAAe,CAC3B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;oBACvB,IAAI,EAAE,gBAAgB,CAAC,UAAU;oBACjC,aAAa,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;wBACvB,IAAI,QAAQ,EAAE;4BACV,OAAO;yBACV;wBACD,QAAQ,GAAG,IAAI,CAAC;wBAChB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,UAAU,EAAE;4BACjD,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;4BACtE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;4BACjB,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;4BAC5C,gBAAgB,CAAC,QAAQ,EAAE,CAAC;4BAC5B,gBAAgB,GAAG,IAAI,CAAC;yBAC3B;oBACL,CAAC;iBACJ,CAAC,CACL,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,iBAAiB,GAAG,UAAU,GAAG,IAAI;YAC/C,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["vue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAc1C,IAAI,iBAAiB,GAAG,CAAC,CAAC;AAE1B,SAAS,qBAAqB,CAAC,OAAO;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACvC,OAAO,IAAI,CAAC;KACf;IAED,MAAM,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/B,OAAO,CACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACtC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;SACvC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;SACrC,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CACnC,CAAC;AACN,CAAC;AAED,MAAM,iBAAiB,GAAG;IACtB,OAAO,CAAC,GAAG;QACP,GAAG,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,SAAS,EAAE,OAA8B;YAChF,OAAO,IAAI,OAAO,CAAC,CAAC,OAA0B,EAAE,EAAE;gBAC9C,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,gBAAgB,GAAG,IAAI,GAAG,CAAC;oBAC3B,IAAI,EAAE,kBAAkB;oBACxB,MAAM,EAAE,IAAI,CAAC,KAAK;oBAClB,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CACV,CAAC,CAAC,SAAS,EAAE;wBACT,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,EAAE,EAAE,OAAO,CAAC,EAAE;wBACd,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC;qBACtC,CAAC;iBACT,CAAC,CAAC;gBACH,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,UAAU,CAAC,eAAe,CAC3B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;oBACvB,IAAI,EAAE,gBAAgB,CAAC,UAAU;oBACjC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE;wBACtB,IAAI,QAAQ,EAAE;4BACV,OAAO;yBACV;wBACD,QAAQ,GAAG,IAAI,CAAC;wBAChB,IAAI,OAAO,CAAC,aAAa,EAAE;4BACvB,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;yBACnD;wBACD,OAAO,CAAC,MAAM,CAAC,CAAC;wBAChB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,UAAU,EAAE;4BACjD,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;4BAC5C,gBAAgB,CAAC,QAAQ,EAAE,CAAC;4BAC5B,gBAAgB,GAAG,IAAI,CAAC;yBAC3B;oBACL,CAAC;iBACJ,CAAC,CACL,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,iBAAiB,GAAG,UAAU,GAAG,IAAI;YAC/C,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
package/vue3/index.js CHANGED
@@ -20,14 +20,15 @@ const showSheet = (component, options) => new Promise((resolve) => {
20
20
  const viewAttached = options.view ?? Frame.topmost().currentPage;
21
21
  viewAttached.showBottomSheet(Object.assign({}, options, {
22
22
  view: navEntryInstance.nativeView,
23
- closeCallback: (...args) => {
23
+ closeCallback: (result) => {
24
24
  if (resolved) {
25
25
  return;
26
26
  }
27
- resolved = true;
27
+ if (options.closeCallback) {
28
+ options.closeCallback(result, navEntryInstance);
29
+ }
30
+ resolve(result);
28
31
  if (navEntryInstance && navEntryInstance) {
29
- options.closeCallback && options.closeCallback.apply(undefined, args);
30
- resolve(...args);
31
32
  navEntryInstance.unmount();
32
33
  modalStack.pop();
33
34
  }
package/vue3/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["vue3/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"../src/","sources":["vue3/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW3D,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,cAAc,GAAG,GAAG,EAAE;IACxB,MAAM,eAAe,GAAG,CAAC,SAAc,EAAE,OAA8B,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC1G,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAEvD,OAAO;QACH,eAAe;QACf,gBAAgB;KACnB,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,OAA8B,EAAE,EAAE,CAC5D,IAAI,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;IACzB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAClF,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACrE,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,gBAAgB,GAAG,gBAAgB,CACnC,SAAS,EACT,MAAM,CAAC,MAAM,CACT,OAAO,CAAC,KAAK,IAAI,EAAE,EACnB,SAAS,CACZ,CACJ,CAAC;IACF,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAEzB,MAAM,YAAY,GAAI,OAAO,CAAC,IAAa,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAE3E,YAAY,CAAC,eAAe,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;QACvB,IAAI,EAAE,gBAAgB,CAAC,UAAU;QACjC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE;YACtB,IAAI,QAAQ,EAAE;gBACV,OAAO;aACV;YACD,IAAI,OAAO,CAAC,aAAa,EAAE;gBACvB,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;aACnD;YACD,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,IAAI,gBAAgB,IAAI,gBAAgB,EAAE;gBACtC,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAC3B,UAAU,CAAC,GAAG,EAAE,CAAC;aACpB;QACL,CAAC;KACJ,CAAC,CACL,CAAC;IACF,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AACtC,CAAC,CAAC,CAAC;AACP,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE;IAC3B,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,qBAAqB,EAAE;QACvB,qBAAqB,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;KAC3D;AACL,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACtB,OAAO,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAE5C,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACrC,OAAO,CAAC,iBAAiB,GAAG,UAAU,CAAC;IAC3C,CAAC;CACJ,CAAC;AAQF,OAAO,EAAE,iBAAiB,EAAyB,cAAc,EAAE,CAAC"}