Skip to content

Commit d33ccaf

Browse files
HUSSAR-mtrelaMonikaKirkovakacheshmarovaadrianptrvsimeonoff
authored
release hotfixes to production - June 2025 (#1016)
* chore(*): update wc version * chore(*): remove igcTabPanelComponent from sample * feat(tabs): update tabs samples * refactor(samples): updating wc styling samples * chore(new-samples): update wc version * mdd-new-data-grid-package-and-updates (#975) * mdd-test-grid-updates mdd-test-grid-updates * mdd-update-to-new-beta mdd-update-to-new-beta * add data-grids add-data-grids * updates updates * Update index.ts * update package lock update package lock * Adding changes from build igniteui-xplat-examples-output+PRs_2025.3.31.1 (#960) Co-authored-by: tfsbuild <[email protected]> Co-authored-by: HUSSAR-mtrela (Martin Trela) <[email protected]> * Adding changes from build igniteui-xplat-examples-output+PRs_2025.5.15.2 (#986) Co-authored-by: tfsbuild <[email protected]> * igniteui-webcomponents-grids v6.0.2 * Update build-pipeline.yml use node 20 * Adding changes from build igniteui-xplat-examples-output+PRs_2025.5.16.2 * Update build-pipeline.yml for Azure Pipelines (#987) Co-authored-by: HUSSAR-mtrela (Martin Trela) <[email protected]> * Update index.html * mdd-updates5.5.0.beta1 mdd-updates5.5.0.beta1 * Adding changes from build igniteui-xplat-examples-output+PRs_2025.5.19.1 * Adding changes from build igniteui-xplat-examples-output+PRs_2025.5.20.5 (#1000) Co-authored-by: tfsbuild <[email protected]> * Adding changes from build igniteui-xplat-examples-output+PRs_2025.5.21.2 (#1001) Co-authored-by: tfsbuild <[email protected]> * Adding changes from build igniteui-xplat-examples-output+PRs_2025.6.2.2 * Adding changes from build igniteui-xplat-examples-output+PRs_2025.6.2.3 * update packages to 6.0.0-beta.0 * update xplat packages to release version 6.0.0 and bump grids to 6.0.3 * Added custom styling to stepper styling sample * combine multiple data sources in code-viewer --------- Co-authored-by: MonikaKirkova <[email protected]> Co-authored-by: Vasya Kacheshmarova <[email protected]> Co-authored-by: Adrian Petrov <[email protected]> Co-authored-by: Simeon Simeonoff <[email protected]> Co-authored-by: mddifilippo89 <[email protected]> Co-authored-by: azure-pipelines[bot] <36771401+azure-pipelines[bot]@users.noreply.github.com> Co-authored-by: tfsbuild <[email protected]> Co-authored-by: IGvaleries <[email protected]> Co-authored-by: Mariela Tihova <[email protected]> Co-authored-by: Deyan Kamburov <[email protected]>
1 parent 3832f49 commit d33ccaf

File tree

3 files changed

+77
-14
lines changed

3 files changed

+77
-14
lines changed

browser/tasks/Transformer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,10 +1031,10 @@ class CodeViewer {
10311031
// jsonContent = jsonContent.replace(/\/\//g, "/");
10321032

10331033
this.hasRelativeAssetsUrls = false;
1034-
this.path = filePath;
1035-
this.content = jsonContent;
10361034
this.isMain = isMain;
10371035
this.fileExtension = fileExtension;
10381036
this.fileHeader = fileHeader;
1037+
this.path = filePath;
1038+
this.content = jsonContent;
10391039
}
10401040
}

browser/tasks/gulp-samples.js

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ var sampleSources = [
4646
// igConfig.SamplesCopyPath + '/charts/data-chart/chart-performance/package.json',
4747
// igConfig.SamplesCopyPath + '/charts/financial-chart/high-frequency/package.json',
4848
// igConfig.SamplesCopyPath + '/charts/financial-chart/high-volume/package.json',
49+
// igConfig.SamplesCopyPath + '/charts/data-chart/data-annotation-multiple-with-stocks/package.json',
4950

5051
// including all samples for all components:
5152
igConfig.SamplesCopyPath + '/**/package.json',
@@ -728,6 +729,7 @@ function updateCodeViewer(cb) {
728729

729730
var content = "{\r\n \"sampleFiles\":\r\n";
730731
var contentItems = [];
732+
var dataFiles = [];
731733

732734
var tsItem = new CodeViewer(sample.SampleFilePath, sample.SampleFileSourceCode, "ts", "ts", true);
733735

@@ -739,19 +741,40 @@ function updateCodeViewer(cb) {
739741
var cssItem = new CodeViewer(file, cssContent, "css", "css", true);
740742
contentItems.push(cssItem);
741743
}
744+
else if (file.indexOf(".html") > 0) {
745+
var tsContent = fs.readFileSync(file, "utf8");
746+
var tsItem = new CodeViewer(file, tsContent, "html", "html", true);
747+
contentItems.push(tsItem);
748+
}
742749
else if (file.indexOf(".ts") > 0 && file.indexOf(sample.SampleFileName) == -1) {
743750

744-
var isIndex = file.indexOf("index.ts") > 0;
745751
var tsContent = fs.readFileSync(file, "utf8");
746752
var tsItem = new CodeViewer(file, tsContent, "ts", "ts", true);
747-
tsItem.fileHeader = isIndex ? "ts" : "DATA";
748-
contentItems.push(tsItem);
753+
754+
if (file.indexOf("index.ts") > 0) {
755+
tsItem.fileHeader = "ts";
756+
contentItems.push(tsItem);
757+
} else {
758+
tsItem.fileHeader = "DATA";
759+
dataFiles.push(tsItem);
760+
}
749761
}
750-
else if (file.indexOf(".html") > 0) {
751-
var tsContent = fs.readFileSync(file, "utf8");
752-
var tsItem = new CodeViewer(file, tsContent, "html", "html", true);
753-
contentItems.push(tsItem);
762+
}
763+
764+
if (dataFiles.length === 1) {
765+
contentItems.push(dataFiles[0]);
766+
} else if (dataFiles.length > 1) {
767+
// combining multiple data files into one data source
768+
var dataPath = dataFiles[0].path;
769+
var dataFolder = dataPath.substring(0, dataPath.lastIndexOf("/"));
770+
var dataContent = "// NOTE this file contains multiple data sources:";
771+
for (let i = 0; i < dataFiles.length; i++) {
772+
const data = dataFiles[i];
773+
dataContent += "\r\n\r\n" + "// Data Source #" + (i+1) + "\r\n";
774+
dataContent += data.content + "\r\n";
754775
}
776+
var dataItem = new CodeViewer(dataFolder + "/DataSources.ts", dataContent, "ts", "DATA", true);
777+
contentItems.push(dataItem);
755778
}
756779

757780
content += JSON.stringify(contentItems, null, ' ');
Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,49 @@
1-
igc-step::part(title) {
2-
color: var(--ig-primary-500);
1+
2+
:root {
3+
--color-teal: rgba(77, 182, 172, 1);
4+
--color-dark-navy: rgba(26, 35, 126, 1);
5+
--color-aqua-gray: rgba(208, 236, 236, 1);
6+
--color-white: rgba(255, 255, 255, 1);
7+
8+
--color-teal-hover: rgba(26, 35, 126, 1);
9+
--color-teal-shadow: rgba(77, 182, 172, 0.5);
310
}
4-
igc-step[active]::part(indicator) {
5-
background-color: var(--ig-primary-500);
11+
12+
igc-button::part(base) {
13+
margin: 1rem 0.5rem 0 0;
14+
background-color: var(--color-teal);
15+
color: var(--color-white);
16+
font-weight: 600;
17+
transition: background-color 0.25s ease, transform 0.1s ease;
18+
}
19+
20+
igc-button:hover::part(base) {
21+
background-color: var(--color-dark-navy);
22+
}
23+
24+
igc-button:active::part(base) {
25+
transform: scale(0.96);
626
}
27+
28+
igc-step::part(title) {
29+
color: var(--color-dark-navy);
30+
font-variant: small-caps;
31+
font-weight: bold;
32+
}
33+
734
igc-step::part(indicator) {
8-
background-color: var(--ig-surface-500);
35+
border-radius: 12px 6px 12px 6px;
36+
background-color: var(--color-aqua-gray);
37+
color: var(--color-dark-navy);
38+
transition: all 0.2s ease;
39+
}
40+
41+
igc-step[active]::part(indicator) {
42+
background-color: var(--color-teal);
43+
box-shadow: 0 2px 8px var(--color-teal-shadow);
44+
transform: scale(1.04);
945
}
46+
47+
igc-step[active]:active::part(indicator) {
48+
transform: scale(1.08);
49+
}

0 commit comments

Comments
 (0)