Skip to content

[mercury] include combo-box icons within assets manager #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 18, 2024
Merged

[mercury] include combo-box icons within assets manager #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
39a67b5
Update assets-manager.ts
bsastregx Oct 16, 2024
e1b9bf3
remove pills mixin `$add--icon` property from mercury.scss
bsastregx Oct 16, 2024
96e4f03
comment ComboBoxItemModel sfrom assets-manager.ts
bsastregx Oct 16, 2024
d53a04d
update showcase files
bsastregx Oct 16, 2024
aab104b
Merge branch 'main' into mercury/ui-updates
bsastregx Oct 17, 2024
02420c0
update chameleon to .46
bsastregx Oct 18, 2024
c92f969
add "scrollable" to combo-box
bsastregx Oct 18, 2024
45827e4
add border to combo-box container
bsastregx Oct 18, 2024
0b1a2d1
include icon for the combo-box
bsastregx Oct 18, 2024
f3b1cbd
update showcase files
bsastregx Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mercury/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"license": "MIT",
"devDependencies": {
"@atao60/fse-cli": "^0.1.9",
"@genexus/chameleon-controls-library": "6.0.0-next.45",
"@genexus/chameleon-controls-library": "6.0.0-next.46",
"@genexus/svg-sass-generator": "1.1.24",
"chokidar": "^3.6.0",
"chokidar-cli": "^3.0.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/mercury/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/mercury/showcase/all.css
View file
Open in desktop

Large diffs are not rendered by default.

113 changes: 113 additions & 0 deletions packages/mercury/showcase/assets/models/combo-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,116 @@
export const comboBoxWithIconsModel = [
{
value: "workflow",
caption: "Workflow",
startImgSrc: "objects/workflow"
},
{
value: "work-panel",
caption: "Work Panel",
startImgSrc: "objects/work-panel"
},
{
value: "webpanel",
caption: "Webpanel",
startImgSrc: "objects/webpanel"
},
{
value: "web-component",
caption: "Web Component",
startImgSrc: "objects/web-component"
},
{
value: "version",
caption: "Version",
startImgSrc: "objects/version"
},
{
value: "url-rewrite",
caption: "Url Rewrite",
startImgSrc: "objects/url-rewrite"
},
{
value: "transaction",
caption: "Transaction",
startImgSrc: "objects/transaction"
},
{
value: "to-be-defined",
caption: "To Be Defined",
startImgSrc: "objects/to-be-defined"
},
{
value: "theme",
caption: "Theme",
startImgSrc: "objects/theme"
},
{
value: "theme-web",
caption: "Theme Web",
startImgSrc: "objects/theme-web"
},
{
value: "theme-for-sd",
caption: "Theme For Sd",
startImgSrc: "objects/theme-for-sd"
},
{
value: "table",
caption: "Table",
startImgSrc: "objects/table"
},
{
value: "super-app",
caption: "Super App",
startImgSrc: "objects/super-app"
},
{
value: "subtype-group",
caption: "Subtype Group",
startImgSrc: "objects/subtype-group"
},
{
value: "structured-data-type",
caption: "Structured Data Type",
startImgSrc: "objects/structured-data-type"
},
{
value: "stencil",
caption: "Stencil",
startImgSrc: "objects/stencil"
},
{
value: "roles",
caption: "Roles",
startImgSrc: "objects/roles"
},
{
value: "report",
caption: "Report",
startImgSrc: "objects/report"
},
{
value: "references",
caption: "References",
startImgSrc: "objects/references"
},
{
value: "query",
caption: "Query",
startImgSrc: "objects/query"
},
{
value: "procedure",
caption: "Procedure",
startImgSrc: "objects/procedure"
},
{
value: "patterns",
caption: "Patterns",
startImgSrc: "objects/patterns"
}
];

export const comboBox1Model = [
{
value: "Value 1",
Expand Down
16 changes: 12 additions & 4 deletions packages/mercury/showcase/assets/scripts/assets-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,9 @@ export const getImagePathCallback = (iconPath) => {
}
return result;
};
export const getActionListImagePathCallback = (additionalItem) => {
const iconPath = additionalItem;
return getImagePathCallback(iconPath);
};
export const getActionListImagePathCallback = (additionalItem) => additionalItem.imgSrc
? getImagePathCallback(additionalItem.imgSrc)
: undefined;
export const getNavigationListImagePathCallback = (itemModel) => itemModel.startImgSrc
? getImagePathCallback(itemModel.startImgSrc)
: undefined;
Expand All @@ -147,6 +146,14 @@ export const getTreeViewImagePathCallback = (item, iconDirection) => {
}
: { default: defaultPath };
};
export const getComboBoxImagePathCallback = (item, iconDirection) => {
if ((!item.startImgSrc && iconDirection === "start") ||
(!item.endImgSrc && iconDirection === "end")) {
return undefined;
}
const imgSrc = iconDirection === "start" ? item.startImgSrc : item.endImgSrc;
return getImagePathCallback(imgSrc);
};
/**
* This object is used to register the getImagePathCallback definitions for all
* controls in Chameleon.
Expand All @@ -159,6 +166,7 @@ export const getTreeViewImagePathCallback = (item, iconDirection) => {
export const getImagePathCallbackDefinitions = {
"ch-accordion-render": getImagePathCallback,
"ch-action-list-render": getActionListImagePathCallback,
"ch-combo-box-render": getComboBoxImagePathCallback,
"ch-navigation-list-render": getNavigationListImagePathCallback,
"ch-checkbox": getImagePathCallback,
"ch-edit": getImagePathCallback,
Expand Down
110 changes: 55 additions & 55 deletions packages/mercury/showcase/assets/scripts/assets/MERCURY_ASSETS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4540,38 +4540,38 @@ export const MERCURY_ASSETS = freeze({
})
})
}),
Cut: freeze({
cut: freeze({
"on-surface": freeze({
enabled: freeze({
name: "system_Cut_on-surface--enabled"
name: "system_cut_on-surface--enabled"
}),
hover: freeze({
name: "system_Cut_on-surface--hover"
name: "system_cut_on-surface--hover"
}),
active: freeze({
name: "system_Cut_on-surface--active"
name: "system_cut_on-surface--active"
}),
disabled: freeze({
name: "system_Cut_on-surface--disabled"
name: "system_cut_on-surface--disabled"
})
}),
"on-elevation": freeze({
enabled: freeze({
name: "system_Cut_on-elevation--enabled"
name: "system_cut_on-elevation--enabled"
})
}),
primary: freeze({
enabled: freeze({
name: "system_Cut_primary--enabled"
name: "system_cut_primary--enabled"
}),
hover: freeze({
name: "system_Cut_primary--hover"
name: "system_cut_primary--hover"
}),
active: freeze({
name: "system_Cut_primary--active"
name: "system_cut_primary--active"
}),
disabled: freeze({
name: "system_Cut_primary--disabled"
name: "system_cut_primary--disabled"
})
})
}),
Expand Down Expand Up @@ -4715,38 +4715,38 @@ export const MERCURY_ASSETS = freeze({
})
})
}),
Card: freeze({
card: freeze({
"on-surface": freeze({
enabled: freeze({
name: "system_Card_on-surface--enabled"
name: "system_card_on-surface--enabled"
}),
hover: freeze({
name: "system_Card_on-surface--hover"
name: "system_card_on-surface--hover"
}),
active: freeze({
name: "system_Card_on-surface--active"
name: "system_card_on-surface--active"
}),
disabled: freeze({
name: "system_Card_on-surface--disabled"
name: "system_card_on-surface--disabled"
})
}),
"on-elevation": freeze({
enabled: freeze({
name: "system_Card_on-elevation--enabled"
name: "system_card_on-elevation--enabled"
})
}),
primary: freeze({
enabled: freeze({
name: "system_Card_primary--enabled"
name: "system_card_primary--enabled"
}),
hover: freeze({
name: "system_Card_primary--hover"
name: "system_card_primary--hover"
}),
active: freeze({
name: "system_Card_primary--active"
name: "system_card_primary--active"
}),
disabled: freeze({
name: "system_Card_primary--disabled"
name: "system_card_primary--disabled"
})
})
}),
Expand Down Expand Up @@ -4785,41 +4785,6 @@ export const MERCURY_ASSETS = freeze({
})
})
}),
Assistant: freeze({
"on-surface": freeze({
enabled: freeze({
name: "system_Assistant_on-surface--enabled"
}),
hover: freeze({
name: "system_Assistant_on-surface--hover"
}),
active: freeze({
name: "system_Assistant_on-surface--active"
}),
disabled: freeze({
name: "system_Assistant_on-surface--disabled"
})
}),
"on-elevation": freeze({
enabled: freeze({
name: "system_Assistant_on-elevation--enabled"
})
}),
primary: freeze({
enabled: freeze({
name: "system_Assistant_primary--enabled"
}),
hover: freeze({
name: "system_Assistant_primary--hover"
}),
active: freeze({
name: "system_Assistant_primary--active"
}),
disabled: freeze({
name: "system_Assistant_primary--disabled"
})
})
}),
"arrow-up": freeze({
"on-surface": freeze({
enabled: freeze({
Expand Down Expand Up @@ -5099,6 +5064,41 @@ export const MERCURY_ASSETS = freeze({
name: "system_add-circle_primary--disabled"
})
})
}),
Assistant: freeze({
"on-surface": freeze({
enabled: freeze({
name: "system_Assistant_on-surface--enabled"
}),
hover: freeze({
name: "system_Assistant_on-surface--hover"
}),
active: freeze({
name: "system_Assistant_on-surface--active"
}),
disabled: freeze({
name: "system_Assistant_on-surface--disabled"
})
}),
"on-elevation": freeze({
enabled: freeze({
name: "system_Assistant_on-elevation--enabled"
})
}),
primary: freeze({
enabled: freeze({
name: "system_Assistant_primary--enabled"
}),
hover: freeze({
name: "system_Assistant_primary--hover"
}),
active: freeze({
name: "system_Assistant_primary--active"
}),
disabled: freeze({
name: "system_Assistant_primary--disabled"
})
})
})
}),
states: freeze({
Expand Down
1 change: 1 addition & 0 deletions packages/mercury/showcase/assets/scripts/bundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const getThemeBundles = (basePath) => [
getThemeModelItem(basePath, "resets/box-sizing"),
// Utils
getThemeModelItem(basePath, "utils/form"),
getThemeModelItem(basePath, "utils/elevation"),
getThemeModelItem(basePath, "utils/form--full"),
getThemeModelItem(basePath, "utils/layout"),
getThemeModelItem(basePath, "utils/typography"),
Expand Down
4 changes: 2 additions & 2 deletions packages/mercury/showcase/assets/scripts/scripts-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { BUTTON_ICONS } from "./icons-showcase-paths.js";
// All definitions in this script are used for local testing purposes
// only. The IDE Web's SDK implements all this and more
import { defineCustomElements } from "https://unpkg.com/@genexus/chameleon-controls-library@6.0.0-next.45/dist/esm/loader.js";
import { registryProperty } from "https://unpkg.com/@genexus/chameleon-controls-library@6.0.0-next.45/dist/esm/index.js";
import { defineCustomElements } from "https://unpkg.com/@genexus/chameleon-controls-library@6.0.0-next.46/dist/esm/loader.js";
import { registryProperty } from "https://unpkg.com/@genexus/chameleon-controls-library@6.0.0-next.46/dist/esm/index.js";
import {
getImagePathCallbackDefinitions,
getIconPath
Expand Down
Loading
Loading