Skip to content
This repository has been archived by the owner on Nov 18, 2024. It is now read-only.

added __self to fbt ignored props #137

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions packages/babel-plugin-fbt/FbtConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ const FbtRequiredAttributes = {
desc: true,
};

const FbtIgnoredAttributes = {
__self: true,
...FbtRequiredAttributes,
};

const PronounRequiredAttributes = {
type: true,
gender: true,
Expand All @@ -102,6 +107,11 @@ const RequiredParamOptions = {
name: true,
};

const IgnoredParamOptions = {
__self: true,
...RequiredParamOptions,
};

const ValidParamOptions = {
number: true,
gender: true,
Expand Down Expand Up @@ -131,6 +141,7 @@ module.exports = {
FbtBooleanOptions,
FbtCallMustHaveAtLeastOneOfTheseAttributes,
FbtRequiredAttributes,
FbtIgnoredAttributes,
FbtType,
JSModuleName,
ModuleNameRegExp,
Expand All @@ -139,6 +150,7 @@ module.exports = {
PluralRequiredAttributes,
PronounRequiredAttributes,
RequiredParamOptions,
IgnoredParamOptions,
ValidFbtOptions,
ValidParamOptions,
ValidPluralOptions,
Expand Down
19 changes: 19 additions & 0 deletions packages/babel-plugin-fbt/__tests__/fbtJsx-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,25 @@ const testData = {
),
},

'should not throw on attributes that are explictly ignored': {
input: withFbtRequireStatement(
`<fbt desc="some-desc" __self={this}>
<fbt:param name="foo" __self={this}>
!{foo}!
</fbt:param>
</fbt>`
),

output: withFbtRequireStatement(
`fbt._(
${payload({
type: "text",
jsfbt: "{foo}",
desc: "some-desc",
})}, [fbt._param("foo", foo)]);`
),
},

'should maintain order of params and enums': {
input: withFbtRequireStatement(
`<fbt desc="some-desc">
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin-fbt/babel-processors/JSXFbtProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const FbtAutoWrap = require('../FbtAutoWrap');
const FbtCommon = require('../FbtCommon');
const {
FbtCallMustHaveAtLeastOneOfTheseAttributes,
FbtRequiredAttributes,
FbtIgnoredAttributes,
ValidFbtOptions,
} = require('../FbtConstants');
const FbtNodeChecker = require('../FbtNodeChecker');
Expand Down Expand Up @@ -134,7 +134,7 @@ class JSXFbtProcessor {
this.t,
attrs,
ValidFbtOptions,
FbtRequiredAttributes,
FbtIgnoredAttributes,
)
: null;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin-fbt/getNamespacedArgs.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const {
PluralOptions,
PluralRequiredAttributes,
PronounRequiredAttributes,
RequiredParamOptions,
IgnoredParamOptions,
ValidParamOptions,
ValidPronounOptions,
ValidPronounUsages,
Expand Down Expand Up @@ -51,7 +51,7 @@ const getNamespacedArgs = function(moduleName, t) {
t,
attributes,
ValidParamOptions,
RequiredParamOptions,
IgnoredParamOptions,
);

let paramChildren = filterEmptyNodes(node.children).filter(function(
Expand Down