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.

Sign up for GitHub

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

Jump to bottom

fix(preset-attributify): add placeholder to default ignore attributes #1263

Merged
merged 2 commits into from Jul 14, 2022
Merged

fix(preset-attributify): add placeholder to default ignore attributes #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
225f54c
fix(preset-attribute): add defaultIgnoreAttributes
zyyv Jul 14, 2022
63cad93
chore: update test
zyyv Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/preset-attributify/src/extractor.ts
View file
Open in desktop
Expand Up @@ -10,9 +10,10 @@ const strippedPrefixes = [
const splitterRE = /[\s'"`;]+/g
const elementRE = /<\w(?=.*>)[\w:\.$-]*\s((?:['"`\{].*?['"`\}]|.*?)*?)>/gs
const valuedAttributeRE = /([?]|(?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-]+)(?:=(["'])([^\2]*?)\2)?/g
export const defaultIgnoreAttributes = ['placeholder']

export const extractorAttributify = (options?: AttributifyOptions): Extractor => {
const ignoreAttributes = options?.ignoreAttributes ?? []
const ignoreAttributes = options?.ignoreAttributes ?? defaultIgnoreAttributes
const nonValuedAttribute = options?.nonValuedAttribute ?? true
const trueToNonValued = options?.trueToNonValued ?? false

Expand Down
4 changes: 2 additions & 2 deletions packages/preset-attributify/src/index.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import type { Preset } from '@unocss/core'
import { extractorSplit } from '@unocss/core'
import { autocompleteExtractorAttributify } from './autocomplete'
import { extractorAttributify } from './extractor'
import { defaultIgnoreAttributes, extractorAttributify } from './extractor'
import type { AttributifyOptions } from './types'
import { variantAttributify } from './variant'

Expand All @@ -16,7 +16,7 @@ const preset = (options: AttributifyOptions = {}): Preset => {
options.prefix = options.prefix ?? 'un-'
options.prefixedOnly = options.prefixedOnly ?? false
options.nonValuedAttribute = options.nonValuedAttribute ?? true
options.ignoreAttributes = options.ignoreAttributes ?? []
options.ignoreAttributes = options.ignoreAttributes ?? defaultIgnoreAttributes

const variants = [
variantAttributify(options),
Expand Down
3 changes: 2 additions & 1 deletion test/__snapshots__/preset-attributify.test.ts.snap
View file
Open in desktop
Expand Up @@ -135,7 +135,7 @@ Set {
"[pt-4=\\"\\"]",
"[px-4=\\"\\"]",
"[text-true-gray-800=\\"\\"]",
"[placeholder=\\"\\"]",
"[un-placeholder~=\\"text-red\\"]",
"[absolute=\\"\\"]",
"[leading-1rem=\\"\\"]",
"[left-4=\\"\\"]",
Expand Down Expand Up @@ -256,6 +256,7 @@ exports[`attributify > fixture2 1`] = `
[peer=\\"\\"]:not(:placeholder-shown)~[peer-not-placeholder-shown~=\\"text-green-500\\"]{--un-text-opacity:1;color:rgba(34,197,94,var(--un-text-opacity));}
[text-gray-7=\\"\\"]{--un-text-opacity:1;color:rgba(55,65,81,var(--un-text-opacity));}
[text-true-gray-800=\\"\\"]{--un-text-opacity:1;color:rgba(38,38,38,var(--un-text-opacity));}
[un-placeholder~=\\"text-red\\"]::placeholder{--un-text-opacity:1;color:rgba(248,113,113,var(--un-text-opacity));}
[group=\\"\\"]:hover [group-hover~=\\"op-50\\"]{opacity:0.5;}
[op-20=\\"\\"]{opacity:0.2;}
[all\\\\:transition-400=\\"\\"] *{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:400ms;}
Expand Down
2 changes: 1 addition & 1 deletion test/preset-attributify.test.ts
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ describe('attributify', () => {
</div>
<div flex>
<div ma inline-flex relative h-14>
<input type="text" m-0 pt-4 px-4 text-true-gray-800 peer placeholder>
<input type="text" m-0 pt-4 px-4 text-true-gray-800 peer placeholder="unocss" un-placeholder="text-red">
<label absolute leading-1rem left-4 pointer-events-none text-gray-7 top="1/3" transition="200 linear"
peer-not-placeholder-shown="-translate-y-4 scale-75 origin-top-left text-green-500"
peer-focus="-translate-y-4 scale-75 origin-top-left text-green-500"
Expand Down