Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
32ffe24
Added InlineAutocomplete stories
Aug 15, 2023
502f787
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Aug 16, 2023
aa38dd2
Merge remote-tracking branch 'origin' into docs/add-inlineAutocomplet…
Aug 23, 2023
641d1e5
fix story naming convention and merge main
Aug 23, 2023
6523ffc
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Aug 30, 2023
44cfa58
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Sep 5, 2023
916bdf3
fix unrelated but breaking test
Sep 5, 2023
f557d08
undo relative time update maybe
Sep 5, 2023
5a47af0
maybe this time
Sep 5, 2023
8ee5d98
Merge remote-tracking branch 'origin' into docs/add-inlineAutocomplet…
Sep 18, 2023
06009bd
fix import
Sep 18, 2023
298fc08
more fix imports
Sep 18, 2023
4c758b1
another fix imports
Sep 18, 2023
04f9ef8
another fix imports
Sep 18, 2023
e593fe8
Merge remote-tracking branch 'origin' into docs/add-inlineAutocomplet…
Oct 30, 2023
069cb5c
fix: update playwright
Oct 30, 2023
fe8215e
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Oct 30, 2023
c226391
Update docs/content/drafts/InlineAutocomplete.mdx
agreenberry Oct 31, 2023
e6cdc41
Update src/InlineAutocomplete/InlineAutocomplete.features.stories.tsx
agreenberry Oct 31, 2023
4764ecb
Update src/InlineAutocomplete/InlineAutocomplete.stories.tsx
agreenberry Oct 31, 2023
260193d
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Oct 31, 2023
7860ea9
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
128a80e
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
3f00c80
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
2e6d660
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
957a7b3
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
e0a836e
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
0324e7e
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
ee92ddb
Update e2e/components/InlineAutocomplete.test.ts
agreenberry Oct 31, 2023
fd3b9b9
Merge branch 'main' into docs/add-inlineAutocomplete-stories
agreenberry Oct 31, 2023
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
4 changes: 2 additions & 2 deletions docs/content/drafts/InlineAutocomplete.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ componentId: inline_autocomplete
status: Draft
description: Provides inline auto completion suggestions for an input or textarea.
source: https://github.com/primer/react/tree/main/src/InlineAutocomplete
storybook: '/react/storybook?path=/story/components-forms-inlineautocomplete--default'
storybook: '/react/storybook?path=/story/drafts-components-inlineautocomplete--default'
---

import data from '../../../src/drafts/InlineAutocomplete/InlineAutocomplete.docs.json'
import data from '../../../src/InlineAutocomplete/InlineAutocomplete.docs.json'

```js
import {InlineAutocomplete} from '@primer/react/drafts'
Expand Down
16 changes: 8 additions & 8 deletions e2e/components/InlineAutocomplete.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test.describe('InlineAutocomplete', () => {
test.describe(theme, () => {
test('default @vrt', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete--default',
id: 'drafts-components-inlineautocomplete--default',
globals: {
colorScheme: theme,
},
Expand All @@ -20,7 +20,7 @@ test.describe('InlineAutocomplete', () => {

test('axe @aat', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete--default',
id: 'drafts-components-inlineautocomplete--default',
globals: {
colorScheme: theme,
},
Expand All @@ -36,7 +36,7 @@ test.describe('InlineAutocomplete', () => {
test.describe(theme, () => {
test('default @vrt', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete--playground',
id: 'drafts-components-inlineautocomplete--playground',
globals: {
colorScheme: theme,
},
Expand All @@ -48,7 +48,7 @@ test.describe('InlineAutocomplete', () => {

test('axe @aat', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete--playground',
id: 'drafts-components-inlineautocomplete--playground',
globals: {
colorScheme: theme,
},
Expand All @@ -64,7 +64,7 @@ test.describe('InlineAutocomplete', () => {
test.describe(theme, () => {
test('default @vrt', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete-features--custom-rendering',
id: 'drafts-components-inlineautocomplete-features--custom-rendering',
globals: {
colorScheme: theme,
},
Expand All @@ -76,7 +76,7 @@ test.describe('InlineAutocomplete', () => {

test('axe @aat', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete-features--custom-rendering',
id: 'drafts-components-inlineautocomplete-features--custom-rendering',
globals: {
colorScheme: theme,
},
Expand All @@ -92,7 +92,7 @@ test.describe('InlineAutocomplete', () => {
test.describe(theme, () => {
test('default @vrt', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete-features--single-line',
id: 'drafts-components-inlineautocomplete-features--single-line',
globals: {
colorScheme: theme,
},
Expand All @@ -104,7 +104,7 @@ test.describe('InlineAutocomplete', () => {

test('axe @aat', async ({page}) => {
await visit(page, {
id: 'components-forms-inlineautocomplete-features--single-line',
id: 'drafts-components-inlineautocomplete-features--single-line',
globals: {
colorScheme: theme,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, {useState} from 'react'
import {Meta} from '@storybook/react'
import {ActionList, Avatar, ActionListItemProps, Textarea, TextInput, FormControl} from '../..'
import {ActionList, Avatar, ActionListItemProps, Textarea, TextInput, FormControl} from '..'
import InlineAutocomplete, {ShowSuggestionsEvent, Suggestions} from '.'

export default {
title: 'Components/Forms/InlineAutocomplete/Features',
title: 'Drafts/Components/InlineAutocomplete/Features',
component: InlineAutocomplete,
} as Meta<typeof InlineAutocomplete>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, {useState} from 'react'
import {Meta} from '@storybook/react'

import {BaseStyles, Box, Textarea, ThemeProvider, FormControl} from '../..'
import {BaseStyles, Box, Textarea, ThemeProvider, FormControl} from '..'
import InlineAutocomplete, {ShowSuggestionsEvent, Suggestions} from '.'

export default {
title: 'Components/Forms/InlineAutocomplete',
title: 'Drafts/Components/InlineAutocomplete',
component: InlineAutocomplete,
decorators: [
Story => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, {useState} from 'react'
import {fireEvent, render, within} from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import InlineAutocomplete, {ShowSuggestionsEvent, Suggestions, Trigger} from '.'
import FormControl from '../../FormControl'
import {ActionList} from '../../ActionList'
import Textarea from '../../Textarea'
import ThemeProvider from '../../ThemeProvider'
import useIsomorphicLayoutEffect from '../../utils/useIsomorphicLayoutEffect'
import FormControl from '../FormControl'
import {ActionList} from '../ActionList'
import Textarea from '../Textarea'
import ThemeProvider from '../ThemeProvider'
import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect'

const label = 'Inline Autocomplete'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, {cloneElement, useRef} from 'react'
import Box from '../../Box'
import Portal from '../../Portal'
import {BetterSystemStyleObject} from '../../sx'
import {useSyntheticChange} from '../hooks/useSyntheticChange'
import {getAbsoluteCharacterCoordinates} from '../utils/character-coordinates'
import Box from '../Box'
import Portal from '../Portal'
import {BetterSystemStyleObject} from '../sx'
import {useSyntheticChange} from '../drafts/hooks/useSyntheticChange'
import {getAbsoluteCharacterCoordinates} from '../drafts/utils/character-coordinates'

import {
SelectSuggestionsEvent,
Expand All @@ -16,9 +16,9 @@ import {
} from './types'
import {augmentHandler, calculateSuggestionsQuery, getSuggestionValue, requireChildrenToBeInput} from './utils'

import {useRefObjectAsForwardedRef} from '../../hooks'
import {useRefObjectAsForwardedRef} from '../hooks'
import AutocompleteSuggestions from './_AutocompleteSuggestions'
import {useFormControlForwardedProps} from '../../FormControl'
import {useFormControlForwardedProps} from '../FormControl'

export type InlineAutocompleteProps = {
/** Register the triggers that can cause suggestions to appear. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, {useCallback, useRef, useState} from 'react'
import Spinner from '../../Spinner'
import {ActionList, ActionListItemProps} from '../../ActionList'
import Box from '../../Box'
import {ComboboxCommitEvent, useCombobox} from '../hooks/useCombobox'
import Overlay from '../../Overlay'
import Spinner from '../Spinner'
import {ActionList, ActionListItemProps} from '../ActionList'
import Box from '../Box'
import {ComboboxCommitEvent, useCombobox} from '../drafts/hooks/useCombobox'
import Overlay from '../Overlay'

import {Suggestion, Suggestions, SuggestionsPlacement, TextInputElement} from './types'
import {getSuggestionKey, getSuggestionValue} from './utils'
import {CharacterCoordinates} from '../utils/character-coordinates'
import useIsomorphicLayoutEffect from '../../utils/useIsomorphicLayoutEffect'
import {CharacterCoordinates} from '../drafts/utils/character-coordinates'
import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect'

type AutoCompleteSuggestionsProps = {
suggestions: Suggestions | null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ActionListItemProps} from '../../ActionList'
import {ActionListItemProps} from '../ActionList'

export type Trigger = {
/** A single character that can cause the suggestion list to open. */
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/storybook.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const allowlist = [
'Header',
'Heading',
'IconButton',
'InlineAutocomplete',
'FilteredActionList',
'Link',
'Octicon',
Expand Down
2 changes: 1 addition & 1 deletion src/drafts/MarkdownEditor/_MarkdownInput.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {subscribe as subscribeToMarkdownPasting} from '@github/paste-markdown'
import React, {forwardRef, useEffect, useMemo, useRef, useState} from 'react'
import {useDynamicTextareaHeight} from '../hooks/useDynamicTextareaHeight'
import InlineAutocomplete, {ShowSuggestionsEvent, Suggestions} from '../InlineAutocomplete'
import InlineAutocomplete, {ShowSuggestionsEvent, Suggestions} from '../../InlineAutocomplete'
import Textarea, {TextareaProps} from '../../Textarea'
import {Emoji, useEmojiSuggestions} from './suggestions/_useEmojiSuggestions'
import {Mentionable, useMentionSuggestions} from './suggestions/_useMentionSuggestions'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useMemo} from 'react'
import {suggestionsCalculator, UseSuggestionsHook} from '.'
import {ActionList} from '../../../ActionList'
import {Suggestion, Trigger} from '../../InlineAutocomplete'
import {Suggestion, Trigger} from '../../../InlineAutocomplete'

type BaseEmoji = {
/** Name (shortcode) of the emoji. Do not include the wrapping `:` symbols. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {score} from 'fzy.js'
import React, {useMemo} from 'react'
import {suggestionsCalculator, UseSuggestionsHook} from '.'
import {ActionList} from '../../../ActionList'
import {Suggestion, Trigger} from '../../InlineAutocomplete'
import {Suggestion, Trigger} from '../../../InlineAutocomplete'
import Text from '../../../Text'

/** Could be a user, team, or organization - anything that can be mentioned. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useMemo} from 'react'
import {suggestionsCalculator, UseSuggestionsHook} from '.'
import {ActionList} from '../../../ActionList'
import {Suggestion, Trigger} from '../../InlineAutocomplete'
import {Suggestion, Trigger} from '../../../InlineAutocomplete'
import Text from '../../../Text'
import {score} from 'fzy.js'

Expand Down
2 changes: 1 addition & 1 deletion src/drafts/MarkdownEditor/suggestions/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Suggestion, Trigger} from '../../InlineAutocomplete'
import {Suggestion, Trigger} from '../../../InlineAutocomplete'

const MAX_SUGGESTIONS = 5

Expand Down
4 changes: 2 additions & 2 deletions src/drafts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ export type {

export * from '../Dialog/Dialog'

export {default as InlineAutocomplete} from './InlineAutocomplete'
export {default as InlineAutocomplete} from '../InlineAutocomplete'
export type {
InlineAutocompleteProps,
ShowSuggestionsEvent,
Suggestion,
Suggestions,
Trigger,
} from './InlineAutocomplete'
} from '../InlineAutocomplete'

export {default as MarkdownViewer} from './MarkdownViewer'
export type {MarkdownViewerProps, InteractiveMarkdownViewerProps} from './MarkdownViewer'
Expand Down