Skip to content
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.

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

Added documentation for htmlIdGenerator #3076

Merged
merged 30 commits into from
Mar 27, 2020
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6e250ab
added documentation for htmlIdGenerator
anishagg17 Mar 14, 2020
e3dafb2
use lables and formRow
anishagg17 Mar 18, 2020
5235577
only one exapmle per section
anishagg17 Mar 19, 2020
5320d37
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
b57fbea
Update src-docs/src/views/html_id_generator/bothPrefixSuffix.js
anishagg17 Mar 19, 2020
3a73690
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
d370ccb
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
78ac3cb
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
49d23f2
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
d3bbc57
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
bdb0935
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 19, 2020
34633f1
Update src-docs/src/views/html_id_generator/htmlIdGeneratorPrefix.js
anishagg17 Mar 19, 2020
e196fec
Update src-docs/src/views/html_id_generator/htmlIdGeneratorSuffix.js
anishagg17 Mar 19, 2020
259d564
added snippets
anishagg17 Mar 19, 2020
ace212e
improved description
anishagg17 Mar 19, 2020
ba7472a
updated description
anishagg17 Mar 20, 2020
a1a90ea
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 20, 2020
40b74c0
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 20, 2020
f983ea1
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
anishagg17 Mar 20, 2020
84dda40
updated ID generattor
anishagg17 Mar 20, 2020
ae5fbe5
added _ to prefix
anishagg17 Mar 21, 2020
a86ca30
updated generator
anishagg17 Mar 24, 2020
77cec44
Update src-docs/src/views/html_id_generator/html_id_generator_example.js
cchaos Mar 25, 2020
831a8ca
added change Log
anishagg17 Mar 26, 2020
ec6f469
Merge branch 'master' into util
anishagg17 Mar 26, 2020
271111b
Merge branch 'master' into util
anishagg17 Mar 26, 2020
ff2451f
Merge branch 'master' into util
anishagg17 Mar 26, 2020
eee7099
Merge branch 'master' into util
anishagg17 Mar 27, 2020
138862f
Merge branch 'master' into util
cchaos Mar 27, 2020
4051cac
Merge branch 'master' into util
cchaos Mar 27, 2020
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
3 changes: 3 additions & 0 deletions src-docs/src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ import { HighlightAndMarkExample } from './views/highlight_and_mark/highlight_an

import { HorizontalRuleExample } from './views/horizontal_rule/horizontal_rule_example';

import { HtmlIdGeneratorExample } from './views/html_id_generator/html_id_generator_example';

import { I18nExample } from './views/i18n/i18n_example';

import { IconExample } from './views/icon/icon_example';
Expand Down Expand Up @@ -414,6 +416,7 @@ const navigation = [
ErrorBoundaryExample,
FocusTrapExample,
HighlightAndMarkExample,
HtmlIdGeneratorExample,
InnerTextExample,
I18nExample,
IsColorDarkExample,
Expand Down
76 changes: 76 additions & 0 deletions src-docs/src/views/html_id_generator/bothPrefixSuffix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import React, { Component, Fragment } from 'react';

import {
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiSpacer,
EuiCode,
EuiFormRow,
} from '../../../../src/components';
import { htmlIdGenerator } from '../../../../src/services';

export class PrefixSufix extends Component {
constructor(props) {
super(props);

this.state = {
prefix: 'Some',
suffix: 'Id',
id1: htmlIdGenerator('Some')('Id'),
};
}

onPrefixChange = e => {
const prefix = e.target.value;
const { suffix } = this.state;

this.setState({
prefix,
id1: htmlIdGenerator(prefix)(suffix),
});
};

onSuffixChange = e => {
const suffix = e.target.value;
const { prefix } = this.state;

this.setState({
suffix,
id1: htmlIdGenerator(prefix)(suffix),
});
};

render() {
const { prefix, suffix, id1 } = this.state;
return (
<Fragment>
<EuiFlexGroup
justifyContent="flexStart"
gutterSize="m"
alignItems="center">
<EuiFlexItem grow={false}>
<EuiFormRow label="Prefix">
<EuiFieldText
value={prefix}
onChange={this.onPrefixChange}
placeholder="Enter prefix"
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFormRow label="Suffix">
<EuiFieldText
value={suffix}
onChange={this.onSuffixChange}
placeholder="Enter suffix"
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="xl" />
<EuiCode>{id1} </EuiCode>
</Fragment>
);
}
}
43 changes: 43 additions & 0 deletions src-docs/src/views/html_id_generator/htmlIdGenerator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React, { Component, Fragment } from 'react';

import {
EuiFlexGroup,
EuiFlexItem,
EuiButton,
EuiCode,
} from '../../../../src/components';

import { htmlIdGenerator } from '../../../../src/services';

export default class extends Component {
constructor(props) {
super(props);

this.state = {
value: htmlIdGenerator()(),
};
}

reGenerate = () => {
this.setState({ value: htmlIdGenerator()() });
};

render() {
const { value } = this.state;
return (
<Fragment>
<EuiFlexGroup
justifyContent="flexStart"
gutterSize="m"
alignItems="center">
<EuiFlexItem grow={false}>
<EuiCode>{value}</EuiCode>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton onClick={this.reGenerate}>Regenerate</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</Fragment>
);
}
}
54 changes: 54 additions & 0 deletions src-docs/src/views/html_id_generator/htmlIdGeneratorPrefix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React, { Component, Fragment } from 'react';

import {
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiSpacer,
EuiCode,
EuiFormRow,
} from '../../../../src/components';
import { htmlIdGenerator } from '../../../../src/services';

export class HtmlIdGeneratorPrefix extends Component {
constructor(props) {
super(props);

this.state = {
prefix: 'Id',
id1: htmlIdGenerator('Id')(),
};
}

onSearchChange = e => {
const prefix = e.target.value;
this.setState({
prefix,
id1: htmlIdGenerator(prefix)(),
});
};

render() {
const { prefix, id1 } = this.state;
return (
<Fragment>
<EuiFlexGroup
justifyContent="flexStart"
gutterSize="m"
alignItems="center">
<EuiFlexItem grow={false}>
<EuiFormRow label="Prefix">
<EuiFieldText
value={prefix}
onChange={this.onSearchChange}
placeholder="Enter prefix"
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="xl" />
<EuiCode>{id1} </EuiCode>
</Fragment>
);
}
}
54 changes: 54 additions & 0 deletions src-docs/src/views/html_id_generator/htmlIdGeneratorSuffix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React, { Component, Fragment } from 'react';

import {
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiSpacer,
EuiCode,
EuiFormRow,
} from '../../../../src/components';
import { htmlIdGenerator } from '../../../../src/services';

export class HtmlIdGeneratorSuffix extends Component {
constructor(props) {
super(props);

this.state = {
suffix: 'Id',
id1: htmlIdGenerator()('Id'),
};
}

onSuffixChange = e => {
const suffix = e.target.value;
this.setState({
suffix,
id1: htmlIdGenerator()(suffix),
});
};

render() {
const { suffix, id1 } = this.state;
return (
<Fragment>
<EuiFlexGroup
justifyContent="flexStart"
gutterSize="m"
alignItems="center">
<EuiFlexItem grow={false}>
<EuiFormRow label="Suffix">
<EuiFieldText
value={suffix}
onChange={this.onSuffixChange}
placeholder="Enter suffix"
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="xl" />
<EuiCode>{id1} </EuiCode>
</Fragment>
);
}
}
121 changes: 121 additions & 0 deletions src-docs/src/views/html_id_generator/html_id_generator_example.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import React from 'react';

import { renderToHtml } from '../../services';

import { GuideSectionTypes } from '../../components';
import { EuiCode } from '../../../../src/components';

import IdGenerator from './htmlIdGenerator';
import { HtmlIdGeneratorPrefix } from './htmlIdGeneratorPrefix';
import { HtmlIdGeneratorSuffix } from './htmlIdGeneratorSuffix';
import { PrefixSufix } from './bothPrefixSuffix';

const htmlIdGeneratorSource = require('!!raw-loader!./htmlIdGenerator');
const htmlIdGeneratorHtml = renderToHtml(IdGenerator);
const htmlIdGeneratorSnippet = ' htmlIdGenerator()()';

const htmlIdGeneratorPrefixSource = require('!!raw-loader!./htmlIdGeneratorPrefix');
const htmlIdGeneratorPrefixHtml = renderToHtml(HtmlIdGeneratorPrefix);
const htmlIdGeneratorPrefixSnippet = " htmlIdGenerator('prefix')()";

const HtmlIdGeneratorSuffixSource = require('!!raw-loader!./htmlIdGeneratorSuffix');
const HtmlIdGeneratorSuffixHtml = renderToHtml(HtmlIdGeneratorSuffix);
const suffixSnippet = " htmlIdGenerator()('suffix')";

const PrefixSufixSource = require('!!raw-loader!./bothPrefixSuffix');
const PrefixSufixHtml = renderToHtml(PrefixSufix);
const prefixSuffixSnippet = " htmlIdGenerator('prefix')('suffix')";

export const HtmlIdGeneratorExample = {
anishagg17 marked this conversation as resolved.
Show resolved Hide resolved
title: 'Html Id Generator',
sections: [
{
source: [
{
type: GuideSectionTypes.JS,
code: htmlIdGeneratorSource,
},
{
type: GuideSectionTypes.HTML,
code: htmlIdGeneratorHtml,
},
],
text: (
<p>
Use <EuiCode>htmlIdGenerator</EuiCode> to generate unique IDs for
elements with an optional <EuiCode>prefix</EuiCode> and/or{' '}
<EuiCode>suffix</EuiCode>. The first call to{' '}
<EuiCode>htmlIdGenerator</EuiCode> accepts the prefix as an optional
argument and returns a second function which accepts an optional
suffix and returns the generated ID.
</p>
),
snippet: htmlIdGeneratorSnippet,
demo: <IdGenerator />,
},
{
title: 'ID generator with prefix',
source: [
{
type: GuideSectionTypes.JS,
code: htmlIdGeneratorPrefixSource,
},
{
type: GuideSectionTypes.HTML,
code: htmlIdGeneratorPrefixHtml,
},
],
text: (
<p>
Provide a <EuiCode>prefix</EuiCode> to the generator to get an ID that
starts with the specified prefix.
</p>
),
snippet: htmlIdGeneratorPrefixSnippet,
demo: <HtmlIdGeneratorPrefix />,
},
{
title: 'ID generator with suffix',
source: [
{
type: GuideSectionTypes.JS,
code: HtmlIdGeneratorSuffixSource,
},
{
type: GuideSectionTypes.HTML,
code: HtmlIdGeneratorSuffixHtml,
},
],
text: (
<p>
Provide a <EuiCode>suffix</EuiCode> to the generator to get an ID that
starts with the specified suffix.
</p>
),
snippet: suffixSnippet,
demo: <HtmlIdGeneratorSuffix />,
},
{
title: 'ID generator with both prefix and suffix',
source: [
{
type: GuideSectionTypes.JS,
code: PrefixSufixSource,
},
{
type: GuideSectionTypes.HTML,
code: PrefixSufixHtml,
},
],
text: (
<p>
The <strong>HtmlIdGenerator</strong> is capable of generating an ID
with both a specified prefix <strong>and</strong>
cchaos marked this conversation as resolved.
Show resolved Hide resolved
suffix.
</p>
),
snippet: prefixSuffixSnippet,
demo: <PrefixSufix />,
},
],
};
10 changes: 7 additions & 3 deletions src/services/accessibility/html_id_generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import uuid from 'uuid';
* specify it, it generates a random id prefix. If you specify a custom prefix
* it should begin with an letter to be HTML4 compliant.
*/
export function htmlIdGenerator(idPrefix?: string) {
const prefix = idPrefix || `i${uuid.v1()}`;
return (suffix?: string) => `${prefix}_${suffix || uuid.v1()}`;
export function htmlIdGenerator(idPrefix: string = '') {
anishagg17 marked this conversation as resolved.
Show resolved Hide resolved
const staticUuid = uuid.v1();
return (idSuffix: string = '') => {
const prefix = `${idPrefix}${idPrefix !== '' ? '_' : 'i'}`;
const suffix = idSuffix ? `_${idSuffix}` : '';
return `${prefix}${suffix ? staticUuid : uuid.v1()}${suffix}`;
};
}