Skip to content

Commit 904075f

Browse files
authored
Merge branch 'master' into rkaraivanov/fix-1521
2 parents 15812ec + df490fd commit 904075f

File tree

8 files changed

+249
-193
lines changed

8 files changed

+249
-193
lines changed

package-lock.json

Lines changed: 203 additions & 175 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373
"autoprefixer": "^10.4.20",
7474
"browser-sync": "^3.0.3",
7575
"cem-plugin-expanded-types": "^1.3.3",
76-
"concurrently": "^9.1.0",
76+
"concurrently": "^9.1.2",
7777
"custom-element-jet-brains-integration": "^1.6.2",
7878
"custom-element-vs-code-integration": "^1.4.1",
7979
"globby": "^14.0.2",
8080
"husky": "^9.1.7",
81-
"ig-typedoc-theme": "^5.0.4",
82-
"igniteui-theming": "^14.3.0",
81+
"ig-typedoc-theme": "^6.0.0",
82+
"igniteui-theming": "^14.3.1",
8383
"keep-a-changelog": "^2.5.3",
84-
"lint-staged": "^15.2.11",
84+
"lint-staged": "^15.3.0",
8585
"lit-analyzer": "^2.0.3",
8686
"madge": "^8.0.0",
8787
"node-watch": "^0.7.4",
@@ -99,10 +99,10 @@
9999
"stylelint-scss": "^6.10.0",
100100
"ts-lit-plugin": "^2.0.2",
101101
"tslib": "^2.8.1",
102-
"typedoc": "^0.26.11",
103-
"typedoc-plugin-localization": "^3.0.5",
104-
"typescript": "^5.6.3",
105-
"vite": "^6.0.3"
102+
"typedoc": "^0.27.6",
103+
"typedoc-plugin-localization": "^3.0.6",
104+
"typescript": "^5.7.2",
105+
"vite": "^6.0.7"
106106
},
107107
"browserslist": [
108108
"defaults"

scripts/build-typedoc.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import path from 'node:path';
22
import { create } from 'browser-sync';
33
import watch from 'node-watch';
4-
import TypeDoc from 'typedoc';
4+
import { Application } from 'typedoc';
55

66
const browserSync = create();
77
const ROOT = path.join.bind(null, path.resolve('./'));
88

99
const TYPEDOC = {
1010
PLUGINS: {
11-
THEME: ROOT('node_modules', 'ig-typedoc-theme'),
12-
LOCALIZATION: ROOT('node_modules', 'typedoc-plugin-localization'),
11+
THEME: ROOT('node_modules', 'ig-typedoc-theme/dist/index.js'),
12+
LOCALIZATION: ROOT(
13+
'node_modules',
14+
'typedoc-plugin-localization/dist/index.js'
15+
),
1316
},
1417
OUTPUT: ROOT('dist', 'docs', 'typescript'),
1518
EXPORT_JSON_PATH: ROOT(
@@ -90,7 +93,7 @@ async function main() {
9093
entryPointStrategy = 'merge';
9194
}
9295

93-
const app = await TypeDoc.Application.bootstrapWithPlugins({
96+
const app = await Application.bootstrapWithPlugins({
9497
entryPoints,
9598
entryPointStrategy,
9699
plugin: [TYPEDOC.PLUGINS.THEME, TYPEDOC.PLUGINS.LOCALIZATION],

src/components/checkbox/themes/shared/checkbox/checkbox.common.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ $theme: $base;
2929
[part~='label'] {
3030
color: var-get($theme, 'disabled-color-label');
3131
}
32+
33+
[part~='indicator'] {
34+
stroke: var-get($theme, 'disabled-tick-color');
35+
}
3236
}

src/components/checkbox/themes/shared/checkbox/checkbox.indigo.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ $error-color-hover: var-get($theme, 'error-color-hover');
220220
}
221221

222222
[part~='indicator'] {
223-
stroke-opacity: 0.4;
223+
stroke: unset;
224+
fill: var-get($theme, 'disabled-tick-color');
224225
}
225226
}
226227

@@ -230,4 +231,12 @@ $error-color-hover: var-get($theme, 'error-color-hover');
230231
background: $disabled-indeterminate-color;
231232
border-color: transparent;
232233
}
234+
235+
[part~='indicator'] {
236+
fill: none;
237+
238+
rect {
239+
fill: var-get($theme, 'disabled-tick-color');
240+
}
241+
}
233242
}

src/components/input/input-base.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,16 @@ export abstract class IgcInputBaseComponent extends FormAssociatedRequiredMixin(
5252
@queryAssignedElements({ slot: 'helper-text' })
5353
protected _helperText!: Array<HTMLElement>;
5454

55-
@queryAssignedElements({ slot: 'prefix' })
55+
@queryAssignedElements({
56+
slot: 'prefix',
57+
selector: '[slot="prefix"]:not([hidden])',
58+
})
5659
protected prefixes!: Array<HTMLElement>;
5760

58-
@queryAssignedElements({ slot: 'suffix' })
61+
@queryAssignedElements({
62+
slot: 'suffix',
63+
selector: '[slot="suffix"]:not([hidden])',
64+
})
5965
protected suffixes!: Array<HTMLElement>;
6066

6167
protected get _isMaterial() {

src/components/stepper/step.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export default class IgcStepComponent extends LitElement {
143143
@property({ attribute: false })
144144
public visited = false;
145145

146-
/** @hidden @intrnal @private */
146+
/** @hidden @internal @private */
147147
@property({ attribute: false })
148148
public animation: Animation = 'fade';
149149

src/components/textarea/textarea.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,16 @@ export default class IgcTextareaComponent extends FormAssociatedRequiredMixin(
103103
@queryAssignedNodes({ flatten: true })
104104
private projected!: Array<Node>;
105105

106-
@queryAssignedElements({ slot: 'prefix' })
106+
@queryAssignedElements({
107+
slot: 'prefix',
108+
selector: '[slot="prefix"]:not([hidden])',
109+
})
107110
protected prefixes!: Array<HTMLElement>;
108111

109-
@queryAssignedElements({ slot: 'suffix' })
112+
@queryAssignedElements({
113+
slot: 'suffix',
114+
selector: '[slot="suffix"]:not([hidden])',
115+
})
110116
protected suffixes!: Array<HTMLElement>;
111117

112118
@query('textarea', true)

0 commit comments

Comments
 (0)