@spartan-ng/cli 0.0.1-alpha.716 → 0.0.1-alpha.718
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.
- package/package.json +1 -1
- package/src/generators/base/generator.d.ts +1 -0
- package/src/generators/base/generator.js +66 -0
- package/src/generators/base/generator.js.map +1 -1
- package/src/generators/healthcheck/healthchecks/version.js +5 -1
- package/src/generators/healthcheck/healthchecks/version.js.map +1 -1
- package/src/generators/migrate-helm-libraries/generator.js +26 -7
- package/src/generators/migrate-helm-libraries/generator.js.map +1 -1
- package/src/generators/migrate-icon/generator.js +1 -1
- package/src/generators/migrate-icon/generator.js.map +1 -1
- package/src/generators/migrate-scroll-area/generator.js +1 -1
- package/src/generators/migrate-scroll-area/generator.js.map +1 -1
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-cancel.ts.template +1 -4
- package/src/generators/ui/libs/autocomplete/files/lib/hlm-autocomplete-search.ts.template +3 -15
- package/src/generators/ui/libs/autocomplete/files/lib/hlm-autocomplete.ts.template +3 -15
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar-multi.ts.template +134 -183
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar-range.ts.template +133 -176
- package/src/generators/ui/libs/calendar/files/lib/hlm-calendar.ts.template +121 -169
- package/src/generators/ui/libs/combobox/files/lib/hlm-combobox-multiple.ts.template +3 -15
- package/src/generators/ui/libs/combobox/files/lib/hlm-combobox.ts.template +3 -15
- package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker-anchor.ts.template +5 -12
- package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker-multi.ts.template +3 -3
- package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker.ts.template +3 -4
- package/src/generators/ui/libs/date-picker/files/lib/hlm-date-range-picker.ts.template +3 -3
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-close.ts.template +1 -1
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-content.ts.template +8 -1
- package/src/generators/ui/libs/drawer/files/lib/hlm-drawer-close.ts.template +1 -1
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-content.ts.template +10 -3
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-item.ts.template +4 -1
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-link.ts.template +4 -4
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-list.ts.template +4 -1
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-trigger.ts.template +15 -4
- package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu.ts.template +6 -1
- package/src/generators/ui/libs/popover/files/index.ts.template +15 -1
- package/src/generators/ui/libs/popover/files/lib/hlm-popover-description.ts.template +12 -0
- package/src/generators/ui/libs/popover/files/lib/hlm-popover-header.ts.template +12 -0
- package/src/generators/ui/libs/popover/files/lib/hlm-popover-title.ts.template +12 -0
- package/src/generators/ui/libs/popover/files/lib/hlm-popover-trigger.ts.template +1 -3
- package/src/generators/ui/libs/popover/files/lib/hlm-popover.ts.template +1 -11
- package/src/generators/ui/libs/select/files/lib/hlm-select-multiple.ts.template +3 -15
- package/src/generators/ui/libs/select/files/lib/hlm-select.ts.template +3 -15
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-close.ts.template +1 -1
- package/src/generators/ui/libs/utils/files/index.ts.template +1 -0
- package/src/generators/ui/libs/utils/files/lib/provide-spartan-hlm.ts.template +34 -0
- package/src/generators/ui/style-luma.css +2 -46
- package/src/generators/ui/style-lyra.css +2 -46
- package/src/generators/ui/style-maia.css +2 -46
- package/src/generators/ui/style-mira.css +2 -46
- package/src/generators/ui/style-nova.css +2 -46
- package/src/generators/ui/style-vega.css +2 -46
- package/src/generators/ui/supported-ui-libraries.json +47 -45
- package/src/utils/string-change.d.ts +26 -0
- package/src/utils/string-change.js +84 -0
- package/src/utils/string-change.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
2
2
|
import type { HlmBaseGeneratorSchema } from './schema';
|
|
3
|
+
export declare function dedupeEntrypointGlobs(patterns: string[], recursiveGlobs: string[]): string[];
|
|
3
4
|
export declare function hlmBaseGenerator(tree: Tree, options: HlmBaseGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
5
|
export default hlmBaseGenerator;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.dedupeEntrypointGlobs = dedupeEntrypointGlobs;
|
|
3
4
|
exports.hlmBaseGenerator = hlmBaseGenerator;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
@@ -40,15 +41,80 @@ function isAlreadyInstalled(tree, alias) {
|
|
|
40
41
|
function setupAngularCliProject(tree, alias, targetLibDir) {
|
|
41
42
|
(0, js_1.addTsConfigPath)(tree, alias, [`./${(0, devkit_1.joinPathFragments)(targetLibDir, 'src', 'index.ts').replace(/\\/g, '/')}`]);
|
|
42
43
|
}
|
|
44
|
+
// nx's `librarySecondaryEntryPointGenerator` appends an entrypoint-prefixed copy of every existing
|
|
45
|
+
// include/exclude glob each time it runs (see `updateTsConfigIncludedFiles`). When many entrypoints
|
|
46
|
+
// are generated into the same library - e.g. `migrate-helm-libraries` (or `ui`) with "all" selected -
|
|
47
|
+
// these arrays double on every call until `JSON.stringify` throws `RangeError: Invalid string length`.
|
|
48
|
+
//
|
|
49
|
+
// The library already includes a recursive `**/*.ts` glob, which matches files in every entrypoint
|
|
50
|
+
// subdirectory, so the prefixed copies are redundant. This collapses them back to a bounded, equivalent
|
|
51
|
+
// set of recursive globs. It is idempotent, so it stays bounded no matter how many entrypoints are added.
|
|
52
|
+
// Collapses the entrypoint-prefixed globs nx accumulates back into their recursive equivalents, keeping
|
|
53
|
+
// `tsconfig.lib.json` bounded. For each glob in `recursiveGlobs` (e.g. `**/*.ts`), any "scoped variant"
|
|
54
|
+
// that it already covers - the recursive glob itself, or a sub-path form like `accordion/src/**/*.ts`
|
|
55
|
+
// that ends in the same `*.ext` suffix - is dropped, and the single recursive glob is restored *only if*
|
|
56
|
+
// such a variant was present. Patterns that aren't a scoped variant (literal files like `jest.config.ts`,
|
|
57
|
+
// a root-only `*.ts`, or a custom glob) are preserved untouched, and no recursive glob is injected unless
|
|
58
|
+
// it was already represented - so the function never widens or adds globs the tsconfig didn't already imply.
|
|
59
|
+
function dedupeEntrypointGlobs(patterns, recursiveGlobs) {
|
|
60
|
+
// The suffix each recursive glob covers in every subdirectory, e.g. '**/*.ts' -> '*.ts'.
|
|
61
|
+
const suffixes = recursiveGlobs.map((glob) => glob.replace(/^\*\*\//, ''));
|
|
62
|
+
const variantSeen = recursiveGlobs.map(() => false);
|
|
63
|
+
// A pattern is a scoped variant of recursiveGlobs[i] only if it is that glob itself, or a recursive
|
|
64
|
+
// sub-path glob (contains `/**/` and ends in `/<suffix>`) - exactly the shape nx prepends per entry
|
|
65
|
+
// point, e.g. `accordion/src/**/*.ts`. A flat `*.ts` or a custom `tools/*.ts` is NOT a variant and is
|
|
66
|
+
// left untouched, so user globs are never widened or dropped.
|
|
67
|
+
const variantIndex = (pattern) => recursiveGlobs.findIndex((recursive, i) => pattern === recursive || (pattern.includes('/**/') && pattern.endsWith(`/${suffixes[i]}`)));
|
|
68
|
+
const result = patterns.filter((pattern) => {
|
|
69
|
+
const index = variantIndex(pattern);
|
|
70
|
+
if (index === -1) {
|
|
71
|
+
return true; // unrelated glob - keep as-is
|
|
72
|
+
}
|
|
73
|
+
variantSeen[index] = true;
|
|
74
|
+
return false; // redundant scoped variant - drop it
|
|
75
|
+
});
|
|
76
|
+
recursiveGlobs.forEach((glob, i) => {
|
|
77
|
+
if (variantSeen[i]) {
|
|
78
|
+
result.push(glob);
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
return result;
|
|
82
|
+
}
|
|
83
|
+
// Targets `tsconfig.lib.json` by convention: that's the file `initializeAngularEntrypoint` seeds and the
|
|
84
|
+
// default build tsConfig for an @nx/angular library, which is also the file nx's secondary-entrypoint
|
|
85
|
+
// generator inflates. A library whose build target points its tsConfig elsewhere isn't normalized here,
|
|
86
|
+
// but the spartan generators never produce that shape.
|
|
87
|
+
function normalizeEntrypointTsConfig(tree, libraryDir) {
|
|
88
|
+
const tsConfigLibPath = (0, devkit_1.joinPathFragments)(libraryDir, 'tsconfig.lib.json');
|
|
89
|
+
if (!tree.exists(tsConfigLibPath)) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
(0, devkit_1.updateJson)(tree, tsConfigLibPath, (json) => {
|
|
93
|
+
if (Array.isArray(json.include)) {
|
|
94
|
+
json.include = dedupeEntrypointGlobs(json.include, ['**/*.ts']);
|
|
95
|
+
}
|
|
96
|
+
if (Array.isArray(json.exclude)) {
|
|
97
|
+
json.exclude = dedupeEntrypointGlobs(json.exclude, ['**/*.spec.ts', '**/*.test.ts']);
|
|
98
|
+
}
|
|
99
|
+
return json;
|
|
100
|
+
});
|
|
101
|
+
}
|
|
43
102
|
async function generateEntrypointFiles(tree, alias, options) {
|
|
44
103
|
const targetLibDir = `${options.directory}/${options.name}/src`;
|
|
45
104
|
if (options.buildable) {
|
|
105
|
+
// Normalize before *and* after: if tsconfig.lib.json is already bloated from an earlier run, the
|
|
106
|
+
// nx generator would re-double the existing arrays and could throw "Invalid string length" before
|
|
107
|
+
// the post-call cleanup runs. Pre-normalizing makes a dirty workspace recover deterministically.
|
|
108
|
+
normalizeEntrypointTsConfig(tree, options.directory);
|
|
46
109
|
await (0, generators_1.librarySecondaryEntryPointGenerator)(tree, {
|
|
47
110
|
name: options.name,
|
|
48
111
|
library: single_lib_name_1.singleLibName,
|
|
49
112
|
skipFormat: true,
|
|
50
113
|
skipModule: true,
|
|
51
114
|
});
|
|
115
|
+
// Collapse the redundant entrypoint-prefixed globs nx just appended so the include/exclude
|
|
116
|
+
// arrays stay bounded as more entrypoints are added. See `dedupeEntrypointGlobs`.
|
|
117
|
+
normalizeEntrypointTsConfig(tree, options.directory);
|
|
52
118
|
}
|
|
53
119
|
else {
|
|
54
120
|
// Resolve the workspace's root tsconfig rather than assuming tsconfig.base.json - a standalone nx
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,11 @@ exports.versionHealthcheck = {
|
|
|
63
63
|
};
|
|
64
64
|
async function fetchLatestMetadata(dep) {
|
|
65
65
|
try {
|
|
66
|
-
|
|
66
|
+
// Respect the project's configured npm registry rather than hardcoding npmjs. This keeps the check
|
|
67
|
+
// correct against private registries, and lets the cli-smoke local registry (which publishes the
|
|
68
|
+
// freshly built packages as "latest") match the installed version instead of flagging a false drift.
|
|
69
|
+
const registry = (process.env.npm_config_registry || 'https://registry.npmjs.org').replace(/\/$/, '');
|
|
70
|
+
const request = await fetch(`${registry}/${dep}/latest`);
|
|
67
71
|
if (!request.ok) {
|
|
68
72
|
return null;
|
|
69
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/version.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/healthcheck/healthchecks/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,18 +36,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.migrateHelmLibrariesGenerator = migrateHelmLibrariesGenerator;
|
|
37
37
|
const devkit_1 = require("@nx/devkit");
|
|
38
38
|
const js_1 = require("@nx/js");
|
|
39
|
-
// Import `removeGenerator` from its module directly rather than the `@nx/workspace` barrel.
|
|
40
|
-
// The barrel eagerly evaluates `convert-to-nx-project`, whose `output.js` crashes on nx 22
|
|
41
|
-
// ("Cannot read properties of undefined (reading 'inverse')") due to a chalk/tslib interop
|
|
42
|
-
// issue in nx itself. Importing the generator directly avoids loading that module.
|
|
43
|
-
// See https://github.com/nrwl/nx/issues/35521 - revert to the barrel once nx ships the fix.
|
|
44
|
-
const remove_1 = require("@nx/workspace/src/generators/remove/remove");
|
|
45
39
|
const enquirer_1 = require("enquirer");
|
|
40
|
+
const node_fs_1 = require("node:fs");
|
|
46
41
|
const path_1 = require("path");
|
|
47
42
|
const config_1 = require("../../utils/config");
|
|
48
43
|
const tsconfig_1 = require("../../utils/tsconfig");
|
|
49
44
|
const deleteFiles_1 = require("../base/lib/deleteFiles");
|
|
50
45
|
const generator_1 = require("../ui/generator");
|
|
46
|
+
// `@nx/workspace`'s `removeGenerator` is reachable two ways, each broken on a different nx version:
|
|
47
|
+
// importing the package entry eagerly evaluates `convert-to-nx-project`, whose `output.js` crashes
|
|
48
|
+
// ("Cannot read properties of undefined (reading 'inverse')") due to a chalk/tslib interop issue
|
|
49
|
+
// (see https://github.com/nrwl/nx/issues/35521), while the deep `@nx/workspace/src/...` specifier is
|
|
50
|
+
// blocked by the package's `exports` map on nx 23+ (where the compiled file also moved to `dist/`).
|
|
51
|
+
// Resolve the compiled generator by absolute path instead: that bypasses the `exports` gate and never
|
|
52
|
+
// loads the crashing barrel. Lazy, so it only runs when a library actually has to be removed.
|
|
53
|
+
function loadRemoveGenerator() {
|
|
54
|
+
const workspaceRoot = (0, path_1.dirname)(require.resolve('@nx/workspace/package.json'));
|
|
55
|
+
const candidates = [
|
|
56
|
+
(0, path_1.join)(workspaceRoot, 'dist', 'src', 'generators', 'remove', 'remove.js'), // nx 23+
|
|
57
|
+
(0, path_1.join)(workspaceRoot, 'src', 'generators', 'remove', 'remove.js'), // nx <= 22
|
|
58
|
+
];
|
|
59
|
+
for (const candidate of candidates) {
|
|
60
|
+
if ((0, node_fs_1.existsSync)(candidate)) {
|
|
61
|
+
// `require` (not `import()`) so an absolute filesystem path is loaded directly: it bypasses the
|
|
62
|
+
// package `exports` gate and, unlike dynamic import, accepts native Windows paths (C:\...) without
|
|
63
|
+
// a file:// URL. This generator already runs as CommonJS.
|
|
64
|
+
return require(candidate).removeGenerator;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
throw new Error(`Could not locate the @nx/workspace remove generator (looked in: ${candidates.join(', ')}). Please report this with your nx version.`);
|
|
68
|
+
}
|
|
51
69
|
async function migrateHelmLibrariesGenerator(tree, options) {
|
|
52
70
|
// Detect the libraries that are already installed
|
|
53
71
|
const config = await (0, config_1.getOrCreateConfig)(tree, { angularCli: options.angularCli });
|
|
@@ -146,7 +164,8 @@ async function removeExistingLibraries(tree, options, libraries) {
|
|
|
146
164
|
if (!projectName) {
|
|
147
165
|
throw new Error(`Could not find the project name for library: ${library} in project root path ${projectRoot}`);
|
|
148
166
|
}
|
|
149
|
-
|
|
167
|
+
const removeGenerator = loadRemoveGenerator();
|
|
168
|
+
await removeGenerator(tree, {
|
|
150
169
|
projectName,
|
|
151
170
|
forceRemove: true,
|
|
152
171
|
skipFormat: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateIconGenerator = migrateIconGenerator;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const string_change_1 = require("@nx/devkit/src/utils/string-change");
|
|
7
6
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
8
7
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
8
|
+
const string_change_1 = require("../../utils/string-change");
|
|
9
9
|
const visit_files_1 = require("../../utils/visit-files");
|
|
10
10
|
async function migrateIconGenerator(tree, { skipFormat }) {
|
|
11
11
|
replaceImports(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-icon/generator.ts"],"names":[],"mappings":";;AAOA,oDAUC;;AAjBD,uCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-icon/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateScrollAreaGenerator = migrateScrollAreaGenerator;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const string_change_1 = require("@nx/devkit/src/utils/string-change");
|
|
7
6
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
8
7
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
8
|
+
const string_change_1 = require("../../utils/string-change");
|
|
9
9
|
async function migrateScrollAreaGenerator(tree, { skipFormat }) {
|
|
10
10
|
replaceImports(tree);
|
|
11
11
|
replaceSelector(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-scroll-area/generator.ts"],"names":[],"mappings":";;AAMA,gEAOC;;AAbD,uCAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-scroll-area/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,7 @@ import { HlmButton, provideBrnButtonConfig } from '<%- importAlias %>/button';
|
|
|
5
5
|
@Directive({
|
|
6
6
|
selector: 'button[hlmAlertDialogCancel]',
|
|
7
7
|
providers: [provideBrnButtonConfig({ variant: 'outline' })],
|
|
8
|
-
hostDirectives: [
|
|
9
|
-
{ directive: BrnDialogClose, inputs: ['delay'] },
|
|
10
|
-
{ directive: HlmButton, inputs: ['variant', 'size'] },
|
|
11
|
-
],
|
|
8
|
+
hostDirectives: [BrnDialogClose, { directive: HlmButton, inputs: ['variant', 'size'] }],
|
|
12
9
|
host: { 'data-slot': 'alert-dialog-cancel', '[type]': 'type()' },
|
|
13
10
|
})
|
|
14
11
|
export class HlmAlertDialogCancel {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Directive } from '@angular/core';
|
|
2
2
|
import { BrnAutocompleteSearch } from '@spartan-ng/brain/autocomplete';
|
|
3
|
-
import {
|
|
4
|
-
import { BrnPopover, provideBrnPopoverConfig } from '@spartan-ng/brain/popover';
|
|
3
|
+
import { BrnPopover, provideBrnPopoverConfig, provideBrnPopoverDefaultOptions } from '@spartan-ng/brain/popover';
|
|
5
4
|
import { classes } from '<%- importAlias %>/utils';
|
|
6
5
|
|
|
7
6
|
@Directive({
|
|
@@ -11,9 +10,7 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
11
10
|
align: 'start',
|
|
12
11
|
sideOffset: 6,
|
|
13
12
|
}),
|
|
14
|
-
|
|
15
|
-
autoFocus: 'first-heading',
|
|
16
|
-
}),
|
|
13
|
+
provideBrnPopoverDefaultOptions({ role: null }),
|
|
17
14
|
],
|
|
18
15
|
hostDirectives: [
|
|
19
16
|
{
|
|
@@ -23,16 +20,7 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
23
20
|
},
|
|
24
21
|
{
|
|
25
22
|
directive: BrnPopover,
|
|
26
|
-
inputs: [
|
|
27
|
-
'align',
|
|
28
|
-
'autoFocus',
|
|
29
|
-
'closeDelay',
|
|
30
|
-
'closeOnOutsidePointerEvents',
|
|
31
|
-
'sideOffset',
|
|
32
|
-
'state',
|
|
33
|
-
'offsetX',
|
|
34
|
-
'restoreFocus',
|
|
35
|
-
],
|
|
23
|
+
inputs: ['align', 'closeOnOutsidePointerEvents', 'sideOffset', 'state', 'offsetX'],
|
|
36
24
|
outputs: ['stateChanged', 'closed'],
|
|
37
25
|
},
|
|
38
26
|
],
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Directive } from '@angular/core';
|
|
2
2
|
import { BrnAutocomplete } from '@spartan-ng/brain/autocomplete';
|
|
3
|
-
import {
|
|
4
|
-
import { BrnPopover, provideBrnPopoverConfig } from '@spartan-ng/brain/popover';
|
|
3
|
+
import { BrnPopover, provideBrnPopoverConfig, provideBrnPopoverDefaultOptions } from '@spartan-ng/brain/popover';
|
|
5
4
|
import { classes } from '<%- importAlias %>/utils';
|
|
6
5
|
|
|
7
6
|
@Directive({
|
|
@@ -11,9 +10,7 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
11
10
|
align: 'start',
|
|
12
11
|
sideOffset: 6,
|
|
13
12
|
}),
|
|
14
|
-
|
|
15
|
-
autoFocus: 'first-heading',
|
|
16
|
-
}),
|
|
13
|
+
provideBrnPopoverDefaultOptions({ role: null }),
|
|
17
14
|
],
|
|
18
15
|
hostDirectives: [
|
|
19
16
|
{
|
|
@@ -23,16 +20,7 @@ import { classes } from '<%- importAlias %>/utils';
|
|
|
23
20
|
},
|
|
24
21
|
{
|
|
25
22
|
directive: BrnPopover,
|
|
26
|
-
inputs: [
|
|
27
|
-
'align',
|
|
28
|
-
'autoFocus',
|
|
29
|
-
'closeDelay',
|
|
30
|
-
'closeOnOutsidePointerEvents',
|
|
31
|
-
'sideOffset',
|
|
32
|
-
'state',
|
|
33
|
-
'offsetX',
|
|
34
|
-
'restoreFocus',
|
|
35
|
-
],
|
|
23
|
+
inputs: ['align', 'closeOnOutsidePointerEvents', 'sideOffset', 'state', 'offsetX'],
|
|
36
24
|
outputs: ['stateChanged', 'closed'],
|
|
37
25
|
},
|
|
38
26
|
],
|