Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Commit

Permalink
NFX-132 changed ollion to nonfx
Browse files Browse the repository at this point in the history
  • Loading branch information
vikas-cldcvr committed Jul 31, 2024
1 parent 7fc9091 commit b6ce624
Show file tree
Hide file tree
Showing 88 changed files with 1,693 additions and 1,675 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@
}
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}
}
2 changes: 1 addition & 1 deletion packages/custom-elements-manifest-to-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
"registry": "https://registry.npmjs.org"
},
"author": ""
}
}
2 changes: 1 addition & 1 deletion packages/flow-code-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@
"homepage": "https://github.com/ollionorg/flow-table#readme",
"author": "@nonfx",
"license": "MIT"
}
}
2 changes: 1 addition & 1 deletion packages/flow-core-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
"homepage": "https://github.com/ollionorg/flow-core#readme",
"author": "@nonfx",
"license": "MIT"
}
}
2 changes: 1 addition & 1 deletion packages/flow-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@
"homepage": "https://github.com/ollionorg/flow-core#readme",
"author": "@nonfx",
"license": "MIT"
}
}
8 changes: 4 additions & 4 deletions packages/flow-core/src/components/f-accordion/f-accordion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ export class FAccordion extends FRoot {
return this.icon === "caret"
? "i-caret-down"
: this.icon === "chevron"
? "i-chevron-down"
: this.open
? "i-minus"
: "i-plus";
? "i-chevron-down"
: this.open
? "i-minus"
: "i-plus";
}

/**
Expand Down
54 changes: 27 additions & 27 deletions packages/flow-core/src/components/f-breadcrumb/f-breadcrumb.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ describe("f-breadcrumb", () => {
const el = await fixture(html`
<f-breadcrumb
.crumbs=${[
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
></f-breadcrumb>
`);
expect(el.getAttribute("size")).to.equal("medium");
Expand All @@ -31,9 +31,9 @@ describe("f-breadcrumb", () => {
<f-breadcrumb
size="small"
.crumbs=${[
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
></f-breadcrumb>
`);
const descendant = el.shadowRoot!.querySelector(".f-breadcrumb-text-hover")!;
Expand All @@ -44,9 +44,9 @@ describe("f-breadcrumb", () => {
<f-breadcrumb
size="small"
.crumbs=${[
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" }
]}
></f-breadcrumb>
`);
const descendant = el.shadowRoot!.querySelectorAll(".f-breadcrumb-content")!;
Expand All @@ -56,12 +56,12 @@ describe("f-breadcrumb", () => {
const el = await fixture(html`
<f-breadcrumb
.crumbs=${[
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" },
{ tabIndex: 2, title: "Label 3" },
{ tabIndex: 3, title: "Label 4" },
{ tabIndex: 4, title: "Label 5" }
]}
{ tabIndex: 0, title: "Label 1" },
{ tabIndex: 1, title: "Label 2" },
{ tabIndex: 2, title: "Label 3" },
{ tabIndex: 3, title: "Label 4" },
{ tabIndex: 4, title: "Label 5" }
]}
></f-breadcrumb>
`);
const descendant = el.shadowRoot!.querySelectorAll(".popover-crumb-list")!;
Expand All @@ -73,12 +73,12 @@ describe("f-breadcrumb", () => {
<f-breadcrumb
.variant=${"icon"}
.crumbs=${[
{ tabIndex: 0, title: "Label 1", icon: "i-app" },
{ tabIndex: 1, title: "Label 2", icon: "i-app" },
{ tabIndex: 2, title: "Label 3", icon: "i-home" },
{ tabIndex: 3, title: "Label 4", icon: "i-info-fill" },
{ tabIndex: 4, title: "Label 5", icon: "i-app" }
]}
{ tabIndex: 0, title: "Label 1", icon: "i-app" },
{ tabIndex: 1, title: "Label 2", icon: "i-app" },
{ tabIndex: 2, title: "Label 3", icon: "i-home" },
{ tabIndex: 3, title: "Label 4", icon: "i-info-fill" },
{ tabIndex: 4, title: "Label 5", icon: "i-app" }
]}
></f-breadcrumb>
`);
const descendant = el.shadowRoot!.querySelector(".f-breadcrumbs")!;
Expand All @@ -90,12 +90,12 @@ describe("f-breadcrumb", () => {
<f-breadcrumb
variant="icon"
.crumbs=${[
{ tabIndex: 0, title: "Home", icon: "i-app" },
{ tabIndex: 1, title: "New Label", icon: "i-app" },
{ tabIndex: 2, title: "Pipeline", icon: "i-home" },
{ tabIndex: 3, title: "Working", icon: "i-info-fill" },
{ tabIndex: 4, title: "Active", icon: "i-app" }
]}
{ tabIndex: 0, title: "Home", icon: "i-app" },
{ tabIndex: 1, title: "New Label", icon: "i-app" },
{ tabIndex: 2, title: "Pipeline", icon: "i-home" },
{ tabIndex: 3, title: "Working", icon: "i-info-fill" },
{ tabIndex: 4, title: "Active", icon: "i-app" }
]}
></f-breadcrumb>
`);
const descendants = el.shadowRoot!.querySelector(".f-breadcrumbs")!;
Expand Down
22 changes: 11 additions & 11 deletions packages/flow-core/src/components/f-breadcrumb/f-breadcrumb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,16 +231,16 @@ export class FBreadcrumb extends FRoot {
@mouseleave=${() => this.toggleBreadcrumbPopover("close")}
>
${this.middlePopoverCrumbs?.map(
(crumb, index) =>
html` <f-div
(crumb, index) =>
html` <f-div
tabindex="0"
role="link"
class="popover-crumb-list"
role="listitem"
padding="medium"
.border=${this.middlePopoverCrumbs.length - 1 === index
? "none"
: "small solid secondary bottom"}
? "none"
: "small solid secondary bottom"}
clickable
@click=${(event: MouseEvent) => this.handleDispatchEvent(event, crumb)}
><f-text
Expand All @@ -251,7 +251,7 @@ export class FBreadcrumb extends FRoot {
>${crumb?.title}</f-text
></f-div
>`
)}
)}
</f-div>
</f-popover>
<f-icon
Expand All @@ -261,15 +261,15 @@ export class FBreadcrumb extends FRoot {
class="system-icon-size"
></f-icon>
${this.endingCrumbs?.map((crumb, index) =>
this.crumbLoop(crumb, index, this.endingCrumbs)
)}
this.crumbLoop(crumb, index, this.endingCrumbs)
)}
`}
</f-div>`;

const iconBreadcrumb = html`<f-div class="f-breadcrumbs" overflow="visible">
${this.crumbs.map((item, index) =>
index !== this.crumbs.length - 1
? html`<f-div
index !== this.crumbs.length - 1
? html`<f-div
class="f-breadcrumb"
state="secondary"
width=${this.crumbSize}
Expand All @@ -283,7 +283,7 @@ export class FBreadcrumb extends FRoot {
>
<f-icon source=${item.icon} .size=${this.iconSize}></f-icon>
</f-div>`
: html`
: html`
<f-div gap="large" align="middle-center">
<div
class="f-breadcrumb-primary"
Expand All @@ -301,7 +301,7 @@ export class FBreadcrumb extends FRoot {
>
</f-div>
`
)}
)}
</f-div>`;
return this.variant === "text" ? textBreadcrumb : iconBreadcrumb;
}
Expand Down
47 changes: 24 additions & 23 deletions packages/flow-core/src/components/f-button/f-button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,9 @@ export class FButton extends FRoot {
return `background-color: ${LightenDarkenColor(
this.fill,
-150
)}; border: 1px solid ${LightenDarkenColor(this.fill, -150)}; color: transparent; fill: ${this.fill
}`;
)}; border: 1px solid ${LightenDarkenColor(this.fill, -150)}; color: transparent; fill: ${
this.fill
}`;
} else if (this.category === "outline") {
return `background: transparent; border: 1px solid ${this.fill}; fill: ${this.fill};`;
} else {
Expand Down Expand Up @@ -332,10 +333,10 @@ export class FButton extends FRoot {
return html`<button
part="f-button-wrapper"
class=${classMap({
"f-button": true,
"custom-loader": this.fill ? true : false,
"custom-hover": this.fill && this.category === "fill" ? true : false
})}
"f-button": true,
"custom-loader": this.fill ? true : false,
"custom-hover": this.fill && this.category === "fill" ? true : false
})}
style=${this.applyStyles()}
category=${ifDefined(this.category)}
size=${ifDefined(this.size)}
Expand All @@ -355,11 +356,11 @@ export class FButton extends FRoot {
return html`<span
part="f-button-wrapper"
class=${classMap({
"f-button": true,
"custom-loader": this.fill ? true : false,
"custom-hover": this.fill && this.category === "fill" ? true : false,
"has-options": this.hasActions ? true : false
})}
"f-button": true,
"custom-loader": this.fill ? true : false,
"custom-hover": this.fill && this.category === "fill" ? true : false,
"has-options": this.hasActions ? true : false
})}
style=${this.applyStyles()}
category=${ifDefined(this.category)}
size=${ifDefined(this.size)}
Expand Down Expand Up @@ -396,29 +397,29 @@ export class FButton extends FRoot {
>
<f-div direction="column" stat="secondary" overflow="scroll">
${this.actions!.map((a, ai) => {
const border = (() => {
if (ai === this.actions!.length - 1) {
return "none";
}
return "small solid secondary bottom";
})();
return html`<f-div
const border = (() => {
if (ai === this.actions!.length - 1) {
return "none";
}
return "small solid secondary bottom";
})();
return html`<f-div
.border=${border}
align="middle-left"
gap="auto"
clickable
@click=${() => this.selectAction(a)}
>
${typeof a === "function"
? a()
: html`<f-div padding="medium" align="middle-left"
? a()
: html`<f-div padding="medium" align="middle-left"
><f-text>${a}</f-text></f-div
>`}
${this.selectedAction === a
? html`<f-icon source="i-tick" style="margin-right:12px;"></f-icon>`
: nothing}
? html`<f-icon source="i-tick" style="margin-right:12px;"></f-icon>`
: nothing}
</f-div>`;
})}
})}
</f-div>
</f-popover>`
: nothing} `;
Expand Down
12 changes: 6 additions & 6 deletions packages/flow-core/src/components/f-carousel/f-carousel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ describe("f-suggest", () => {
const el = await fixture<FCarousel>(html`
<f-carousel active-content-id="slide-3">
${[1, 2, 3, 4, 5, 6, 7, 8, 9].map(
idx =>
html`<f-carousel-content content-id=${"slide-" + idx}>
idx =>
html`<f-carousel-content content-id=${"slide-" + idx}>
<f-div> ${unsafeSVG(FCarouselExample)} </f-div>
<f-text>${"slide-" + idx}</f-text>
</f-carousel-content>`
)}
)}
</f-carousel>
`);
await el.updateComplete;
Expand All @@ -45,12 +45,12 @@ describe("f-suggest", () => {
const el = await fixture<FCarousel>(html`
<f-carousel active-content-id="slide-3">
${[1, 2, 3, 4, 5, 6, 7, 8, 9].map(
idx =>
html`<f-carousel-content content-id=${"slide-" + idx}>
idx =>
html`<f-carousel-content content-id=${"slide-" + idx}>
<f-div> ${unsafeSVG(FCarouselExample)} </f-div>
<f-text>${"slide-" + idx}</f-text>
</f-carousel-content>`
)}
)}
</f-carousel>
`);

Expand Down
8 changes: 4 additions & 4 deletions packages/flow-core/src/components/f-carousel/f-carousel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ export class FCarousel extends FRoot {
source="i-chevron-left"
clickable
@keyup=${(e: KeyboardEvent) => {
if (e.key === "Enter") this.handleNavigation("prev");
}}
if (e.key === "Enter") this.handleNavigation("prev");
}}
@click=${() => this.handleNavigation("prev")}
></f-icon
></f-div>
Expand All @@ -147,8 +147,8 @@ export class FCarousel extends FRoot {
tabindex="0"
clickable
@keyup=${(e: KeyboardEvent) => {
if (e.key === "Enter") this.handleNavigation("next");
}}
if (e.key === "Enter") this.handleNavigation("next");
}}
@click=${() => this.handleNavigation("next")}
></f-icon>
</f-div>
Expand Down
4 changes: 2 additions & 2 deletions packages/flow-core/src/components/f-checkbox/f-checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ export class FCheckbox extends FRoot {
<label for="f-checkbox" value=${this.value} state=${this.state} size=${this.size}>
<span class="f-a11y-hidden-label">${this.value}</span>
${this.value === "checked"
? html`${unsafeSVG(checkedMark)}`
: html`${unsafeSVG(indeterminateMark)}`}
? html`${unsafeSVG(checkedMark)}`
: html`${unsafeSVG(indeterminateMark)}`}
</label>
<f-div
padding="none"
Expand Down
Loading

0 comments on commit b6ce624

Please sign in to comment.